Fix T5 alignment issues

This commit is contained in:
Jan 2021-05-19 18:30:12 +02:00
parent 224da79cf4
commit 910ffb3195

View File

@ -491,7 +491,7 @@ namespace T5
XSurfaceCollisionTree* collisionTree; XSurfaceCollisionTree* collisionTree;
}; };
typedef tdef_align(16) unsigned short r_index16_t; typedef tdef_align(16) uint16_t r_index16_t;
struct XSurface struct XSurface
{ {
@ -1562,7 +1562,7 @@ namespace T5
int maxy; int maxy;
}; };
struct ComWaterCell struct type_align(4) ComWaterCell
{ {
int16_t waterheight; int16_t waterheight;
char flooroffset; char flooroffset;
@ -2095,6 +2095,8 @@ namespace T5
uint16_t dynEntId; uint16_t dynEntId;
}; };
typedef tdef_align(4) GfxSceneDynModel GfxSceneDynModel4;
struct BModelDrawInfo struct BModelDrawInfo
{ {
uint16_t surfId; uint16_t surfId;
@ -2156,7 +2158,7 @@ namespace T5
int stream2ByteOffset; int stream2ByteOffset;
}; };
struct GfxSurface struct type_align(16) GfxSurface
{ {
srfTriangles_t tris; srfTriangles_t tris;
Material* material; Material* material;
@ -2328,7 +2330,7 @@ namespace T5
float outdoorLookupMatrix[4][4]; float outdoorLookupMatrix[4][4];
GfxImage* outdoorImage; GfxImage* outdoorImage;
unsigned int* cellCasterBits; unsigned int* cellCasterBits;
GfxSceneDynModel* sceneDynModel; GfxSceneDynModel4* sceneDynModel;
GfxSceneDynBrush* sceneDynBrush; GfxSceneDynBrush* sceneDynBrush;
unsigned int* primaryLightEntityShadowVis; unsigned int* primaryLightEntityShadowVis;
unsigned int* primaryLightDynEntShadowVis[2]; unsigned int* primaryLightDynEntShadowVis[2];