diff Indoor.h @ 1669:bd28d08e2c75

Merge
author Ritor1
date Tue, 17 Sep 2013 22:55:48 +0600
parents 466c5e15f524
children 8971dc85b8fb
line wrap: on
line diff
--- a/Indoor.h	Tue Sep 17 22:55:34 2013 +0600
+++ b/Indoor.h	Tue Sep 17 22:55:48 2013 +0600
@@ -469,38 +469,8 @@
 
 
 
-/*  263 */
-#pragma pack(push, 1)
-struct IndoorLocation_drawstru
-{
-  int field_0_timer;
-  int uFlags;              // & INDOOR_CAMERA_DRAW_D3D_OUTLINES:  render d3d outlines
-  Vec3_int_ vPosition;
-  int sRotationY;
-  int sRotationX;
-  int field_1C_mb_fov;
-  unsigned __int16 *pRenderTarget;
-  unsigned int uTargetWidth;
-  unsigned int uTargetHeight;
-  signed int uViewportX;
-  signed int uViewportY;
-  signed int uViewportZ;
-  signed int uViewportW;
-  int field_3C;
-  int *pTargetZ;
-};
-#pragma pack(pop)
-
-
-
-
-
-
-
-
-
-
-
+#define BLV_RENDER_DRAW_SW_OUTLINES  1
+#define BLV_RENDER_DRAW_D3D_OUTLINES 2
 
 /*  162 */
 #pragma pack(push, 1)
@@ -508,15 +478,20 @@
 {
   inline BLVRenderParams():
     uFlags(0)
-  {}
+  {
+    uViewportX = 0;
+    uViewportY = 0;
+    uViewportZ = 0;
+    uViewportW = 0;
+  }
 
-  int Reset(struct IndoorLocation_drawstru *a2);
+  void Reset();
 
   int field_0_timer_;
   int uFlags;              // & INDOOR_CAMERA_DRAW_D3D_OUTLINES:  render d3d outlines
-  Vec3_int_ vPartyPos;
-  int sPartyRotY;
-  int sPartyRotX;
+  Vec3_int_ _unused_vPartyPos;
+  int _unused_sPartyRotY;
+  int _unused_sPartyRotX;
   int uPartySectorID;
   int sCosineY;
   int sSineY;
@@ -526,8 +501,8 @@
   float fSineY;
   float fCosineNegX;
   float fSineNegX;
-  int field_40;
-  int field_44;//float
+  int fov_rad_fixpoint;
+  int fov_rad_inv_fixpoint;//float
   unsigned __int16 *pRenderTarget;
   unsigned int uTargetWidth;
   unsigned int uTargetHeight;
@@ -538,7 +513,7 @@
   int field_64;
   int *pTargetZBuffer;
   int uViewportHeight;
-  int field_70;
+  int uViewportWidth;
   int uViewportCenterX;
   int uViewportCenterY;
   struct BspRenderer_PortalViewportData *field_7C;
@@ -550,8 +525,7 @@
   int field_94;
 };
 #pragma pack(pop)
-
-extern struct BLVRenderParams *pBLVRenderParams;
+extern BLVRenderParams *pBLVRenderParams;