mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2025-10-10 01:50:36 +00:00
Code Issues Projects Releases Wiki Activity

Fixed typos and made all assert functions optional

Browse source
This commit is contained in:
bigbossbro08 2020-05-10 21:49:33 +06:00
commit c798e1bacd
73 changed files with 110 additions and 184 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/modelinfo/BaseModelInfo.h
View file

@ -15,7 +15,7 @@ enum ModelInfoType : uint8
MITYPE_PED = 6,
MITYPE_XTRACOMPS = 7,
};
static_assert(sizeof(ModelInfoType) == 1, "ModeInfoType: error");
VALIDATE_SIZE(ModelInfoType, 1);
class C2dEffect;
@ -70,6 +70,4 @@ public:
uint16 GetNumRefs() const { return m_refCount; }
};
#ifdef CHECK_STRUCT_SIZES
static_assert(sizeof(CBaseModelInfo) == 0x30, "CBaseModelInfo: error");
#endif
VALIDATE_SIZE(CBaseModelInfo, 0x30);

4
src/modelinfo/ClumpModelInfo.h
View file

@ -51,6 +51,4 @@ public:
static RwFrame *GetFrameFromId(RpClump *clump, int32 id);
};
#ifdef CHECK_STRUCT_SIZES
static_assert(sizeof(CClumpModelInfo) == 0x34, "CClumpModelInfo: error");
#endif
VALIDATE_SIZE(CClumpModelInfo, 0x34);

2
src/modelinfo/PedModelInfo.h
View file

@ -55,5 +55,5 @@ public:
#endif
};
#ifndef PED_SKIN
static_assert(sizeof(CPedModelInfo) == 0x48, "CPedModelInfo: error");
VALIDATE_SIZE(CPedModelInfo, 0x48);
#endif

4
src/modelinfo/SimpleModelInfo.h
View file

@ -50,6 +50,4 @@ public:
m_atomics[2] = (RpAtomic*)m; }
};
#ifdef CHECK_STRUCT_SIZES
static_assert(sizeof(CSimpleModelInfo) == 0x4C, "CSimpleModelInfo: error");
#endif
VALIDATE_SIZE(CSimpleModelInfo, 0x4C);

4
src/modelinfo/TimeModelInfo.h
View file

@ -18,6 +18,4 @@ public:
CTimeModelInfo *FindOtherTimeModel(void);
};
#ifdef CHECK_STRUCT_SIZES
static_assert(sizeof(CTimeModelInfo) == 0x58, "CTimeModelInfo: error");
#endif
VALIDATE_SIZE(CTimeModelInfo, 0x58);

4
src/modelinfo/VehicleModelInfo.h
View file

@ -124,6 +124,4 @@ public:
static void SetComponentsToUse(int8 c1, int8 c2) { ms_compsToUse[0] = c1; ms_compsToUse[1] = c2; }
};
#ifdef CHECK_STRUCT_SIZES
static_assert(sizeof(CVehicleModelInfo) == 0x1F8, "CVehicleModelInfo: error");
#endif
VALIDATE_SIZE(CVehicleModelInfo, 0x1F8);