Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

[ZoneBuilder] Updated GfxWorld struct to be correct now

Browse Source
This commit is contained in:
TheApadayo 2016-12-19 16:12:47 -05:00
parent 28767e9b56
commit 38abd43533
1 changed files with 20 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/Game/Structs.hpp
View File

@ -195,7 +195,7 @@ namespace Game
char unknown1[8]; char unknown1[8];
int size; int size;
char unknown2[22]; char unknown2[22];
char *data; // size = soundSize char *data; // size = soundSize
}; };
struct LoadedSound struct LoadedSound
@ -292,19 +292,19 @@ namespace Game
short dimensions[3]; short dimensions[3];
int format; // usually the compression Magic int format; // usually the compression Magic
int dataSize; // set to zero to load from IWD int dataSize; // set to zero to load from IWD
char data[1]; char data[1];
}; };
struct GfxImage struct GfxImage
{ {
union union
{ {
GfxImageLoadDef* loadDef; GfxImageLoadDef* loadDef;
#ifdef __cplusplus #ifdef __cplusplus
IDirect3DTexture9* texture; IDirect3DTexture9* texture;
#endif #endif
}; };
char mapType; // 5 is cube, 4 is 3d, 3 is 2d char mapType; // 5 is cube, 4 is 3d, 3 is 2d
char semantic; char semantic;
char category; char category;
@ -491,7 +491,7 @@ namespace Game
ITEM_TEXTSTYLE_BORDERED = 7, // border (stroke) ITEM_TEXTSTYLE_BORDERED = 7, // border (stroke)
ITEM_TEXTSTYLE_BORDEREDMORE = 8, // more border :P ITEM_TEXTSTYLE_BORDEREDMORE = 8, // more border :P
ITEM_TEXTSTYLE_MONOSPACE = 128, ITEM_TEXTSTYLE_MONOSPACE = 128,
ITEM_TEXTSTYLE_MONOSPACESHADOWED = 132, ITEM_TEXTSTYLE_MONOSPACESHADOWED = 132,
}; };
#define ITEM_TYPE_TEXT 0 // simple text #define ITEM_TYPE_TEXT 0 // simple text
@ -929,7 +929,7 @@ namespace Game
FS_LIST_ALL = 0x1, FS_LIST_ALL = 0x1,
}; };
typedef enum typedef enum
{ {
NA_BOT, NA_BOT,
NA_BAD, // an address lookup failed NA_BAD, // an address lookup failed
@ -939,7 +939,7 @@ namespace Game
NA_IP6, // custom type NA_IP6, // custom type
} netadrtype_t; } netadrtype_t;
typedef enum typedef enum
{ {
NS_CLIENT, NS_CLIENT,
NS_SERVER NS_SERVER
@ -951,7 +951,7 @@ namespace Game
DWORD full; DWORD full;
} netIP_t; } netIP_t;
typedef struct typedef struct
{ {
netadrtype_t type; netadrtype_t type;
netIP_t ip; netIP_t ip;
@ -980,7 +980,7 @@ namespace Game
PLAYER_FLAG_FROZEN = 1 << 2, PLAYER_FLAG_FROZEN = 1 << 2,
}; };
typedef struct gclient_s typedef struct gclient_s
{ {
unsigned char pad[12764]; unsigned char pad[12764];
unsigned int team; unsigned int team;
@ -989,7 +989,7 @@ namespace Game
char pad3[724]; char pad3[724];
} gclient_t; } gclient_t;
typedef struct gentity_s typedef struct gentity_s
{ {
unsigned char pad[312]; // 0 unsigned char pad[312]; // 0
float origin[3]; // 312 float origin[3]; // 312
@ -1506,9 +1506,9 @@ namespace Game
short maxSurfs;// +6 short maxSurfs;// +6
XModelSurfs* surfaces; // +8 XModelSurfs* surfaces; // +8
int partBits[4]; // +12 int partBits[4]; // +12
char pad3[8]; char pad3[8];
XSurface* surfs; XSurface* surfs;
char pad4[4]; char pad4[4];
}; };
struct cplane_t struct cplane_t
@ -2992,7 +2992,9 @@ namespace Game
int unknown2; int unknown2;
unsigned int skyCount; unsigned int skyCount;
GfxSky* skies; GfxSky* skies;
char unknown1[0x18]; int unkCount1;
int unkCount2;
char unknown1[16];
GfxWorldDpvsPlanes dpvsPlanes; //The following rely on the count in this GfxWorldDpvsPlanes dpvsPlanes; //The following rely on the count in this
GfxCellTreeCount *aabbTreeCounts; GfxCellTreeCount *aabbTreeCounts;
GfxCellTree *aabbTrees; GfxCellTree *aabbTrees;
@ -3007,7 +3009,9 @@ namespace Game
int materialMemoryCount; int materialMemoryCount;
MaterialMemory *materialMemory; MaterialMemory *materialMemory;
sunflare_t sun; sunflare_t sun;
unsigned int *cellCasterBits[2]; char pad[64];
GfxImage* unknownImage;
unsigned int *cellCasterBits[2];
GfxSceneDynModel *sceneDynModel; GfxSceneDynModel *sceneDynModel;
GfxSceneDynBrush *sceneDynBrush; GfxSceneDynBrush *sceneDynBrush;
unsigned int *primaryLightEntityShadowVis; unsigned int *primaryLightEntityShadowVis;
@ -3015,25 +3019,9 @@ namespace Game
char *primaryLightForModelDynEnt; char *primaryLightForModelDynEnt;
GfxShadowGeometry *shadowGeom; GfxShadowGeometry *shadowGeom;
GfxLightRegion *lightRegion; GfxLightRegion *lightRegion;
char pad[24];
GfxImage* unknownImage;
char* unknown6;
char* unknown7;
char* unknown8;
char* unknown9;
char* unknown10;
char* unknown11;
char* unknown12;
char* unknown13;
char* unknown14;
char* unknown15;
GfxWorldDpvsStatic dpvs; GfxWorldDpvsStatic dpvs;
GfxWorldDpvsDynamic dpvsDyn; GfxWorldDpvsDynamic dpvsDyn;
char pad2[4]; char pad2[4];
unsigned int heroOnlyLightCount; unsigned int heroOnlyLightCount;
char * heroOnlyLight; char * heroOnlyLight;
int unknown5; int unknown5;
@ -3320,9 +3308,9 @@ namespace Game
char meleeChargeDist; char meleeChargeDist;
}; };
#pragma pack(pop) #pragma pack(pop)
typedef char mapname_t[40]; typedef char mapname_t[40];
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif