Fixed typos and made all assert functions optional

This commit is contained in:
bigbossbro08
2020-05-10 21:49:33 +06:00
parent af6e132b37
commit c798e1bacd
73 changed files with 110 additions and 184 deletions

View File

@ -20,9 +20,7 @@ public:
// no methods
};
#ifdef CHECK_STRUCT_SIZES
static_assert(sizeof(cAudioCollision) == 40, "cAudioCollision: error");
#endif
VALIDATE_SIZE(cAudioCollision, 40);
class cAudioCollisionManager
{
@ -37,6 +35,4 @@ public:
void AddCollisionToRequestedQueue();
};
#ifdef CHECK_STRUCT_SIZES
static_assert(sizeof(cAudioCollisionManager) == 852, "cAudioCollisionManager: error");
#endif
VALIDATE_SIZE(cAudioCollisionManager, 852);

View File

@ -35,7 +35,7 @@ public:
int8 m_nVolumeChange;
};
static_assert(sizeof(tSound) == 92, "tSound: error");
VALIDATE_SIZE(tSound, 92);
class CPhysical;
class CAutomobile;
@ -52,9 +52,7 @@ public:
uint8 m_AudioEvents;
};
#ifdef CHECK_STRUCT_SIZES
static_assert(sizeof(tAudioEntity) == 40, "tAudioEntity: error");
#endif
VALIDATE_SIZE(tAudioEntity, 40);
class tPedComment
{
@ -67,7 +65,7 @@ public:
int8 m_nProcess;
};
static_assert(sizeof(tPedComment) == 28, "tPedComment: error");
VALIDATE_SIZE(tPedComment, 28);
class cPedComments
{
@ -82,7 +80,7 @@ public:
void Process();
};
static_assert(sizeof(cPedComments) == 1164, "cPedComments: error");
VALIDATE_SIZE(cPedComments, 1164);
class CEntity;
@ -98,8 +96,7 @@ public:
int32 m_nMissionAudioCounter;
bool m_bIsPlayed;
};
static_assert(sizeof(cMissionAudio) == 32, "cMissionAudio: error");
VALIDATE_SIZE(cMissionAudio, 32);
// name made up
class cAudioScriptObjectManager
@ -137,9 +134,7 @@ public:
float m_fVelocityChange;
};
#ifdef CHECK_STRUCT_SIZES
static_assert(sizeof(cVehicleParams) == 0x18, "cVehicleParams: error");
#endif
VALIDATE_SIZE(cVehicleParams, 0x18);
enum {
/*

View File

@ -148,6 +148,6 @@ public:
static void SaveAllAudioScriptObjects(uint8 *buf, uint32 *size);
};
static_assert(sizeof(cAudioScriptObject) == 20, "cAudioScriptObject: error");
VALIDATE_SIZE(cAudioScriptObject, 20);
extern void PlayOneShotScriptObject(uint8 id, CVector const &pos);

View File

@ -84,6 +84,6 @@ public:
bool ChangeRadioChannel();
};
static_assert(sizeof(cMusicManager) == 0x95C, "cMusicManager: error");
VALIDATE_SIZE(cMusicManager, 0x95C);
extern cMusicManager MusicManager;

View File

@ -15,7 +15,7 @@ struct cAMCrime {
}
};
static_assert(sizeof(cAMCrime) == 20, "cAMCrime: error ");
VALIDATE_SIZE(cAMCrime, 20);
class cPoliceRadioQueue
{
@ -43,4 +43,4 @@ public:
}
};
static_assert(sizeof(cPoliceRadioQueue) == 444, "cPoliceRadioQueue: error ");
VALIDATE_SIZE(cPoliceRadioQueue, 444);