Mercurial > mm7
diff Indoor.h @ 726:9d13d2ec35a6
Слияние
author | Ritor1 |
---|---|
date | Fri, 22 Mar 2013 01:29:46 +0600 |
parents | a5e587c8e30e |
children | 346f7069676a |
line wrap: on
line diff
--- a/Indoor.h Fri Mar 22 01:29:25 2013 +0600 +++ b/Indoor.h Fri Mar 22 01:29:46 2013 +0600 @@ -177,7 +177,7 @@ /* 98 */ #pragma pack(push, 1) -struct BLVLightMM7 +struct BLVLightMM7 //10h { struct Vec3_short_ vPosition; __int16 uRadius; @@ -202,7 +202,7 @@ /* 100 */ #pragma pack(push, 1) -struct BLVDoor +struct BLVDoor //50h { enum State: unsigned __int16 { @@ -238,7 +238,7 @@ /* 101 */ #pragma pack(push, 1) -struct BLVMapOutline +struct BLVMapOutline //0C { unsigned __int16 uVertex1ID; unsigned __int16 uVertex2ID; @@ -264,7 +264,7 @@ /* 93 */ #pragma pack(push, 1) -struct BLVFace +struct BLVFace //60h { //----- (0046ED02) -------------------------------------------------------- inline BLVFace() @@ -315,7 +315,7 @@ /* 94 */ #pragma pack(push, 1) -struct BLVFaceExtra +struct BLVFaceExtra //24h { bool HasEventint(); @@ -342,7 +342,7 @@ /* 95 */ #pragma pack(push, 1) -struct BLVSector +struct BLVSector //0x74 { int field_0; unsigned __int16 uNumFloors; @@ -392,8 +392,8 @@ #pragma pack(push, 1) struct BLVMapOutlines { - uint uNumOutlines; - BLVMapOutline pOutlines[1]; + int uNumOutlines; + BLVMapOutline pOutlines[7000]; }; #pragma pack(pop) @@ -435,10 +435,10 @@ int GetSector(int sX, int sY, int sZ); void Release(); - int Alloc(); + bool Alloc(); bool Load(char *pFilename, int a3, size_t i, char *pDest); void Draw(); - void ToggleLight(unsigned int uLightID, unsigned int bToggle); + void ToggleLight(signed int uLightID, unsigned int bToggle); static unsigned int GetLocationIndex(const char *Str1); static void ExecDraw(bool bD3D); @@ -503,10 +503,10 @@ unsigned __int16 *pRenderTarget; unsigned int uTargetWidth; unsigned int uTargetHeight; - unsigned int uViewportX; - unsigned int uViewportY; - unsigned int uViewportZ; - unsigned int uViewportW; + signed int uViewportX; + signed int uViewportY; + signed int uViewportZ; + signed int uViewportW; int field_3C; int *pTargetZ; };