From af6e132b37e8b7e89e4c0c7a52e5bb81e4b1b9a8 Mon Sep 17 00:00:00 2001 From: bigbossbro08 Date: Sun, 10 May 2020 19:54:37 +0600 Subject: defined out asserts. --- src/audio/AudioManager.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/audio/AudioManager.h') diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h index 0d0c5d91..5f00eac4 100644 --- a/src/audio/AudioManager.h +++ b/src/audio/AudioManager.h @@ -52,7 +52,9 @@ public: uint8 m_AudioEvents; }; +#ifdef CHECK_STRUCT_SIZES static_assert(sizeof(tAudioEntity) == 40, "tAudioEntity: error"); +#endif class tPedComment { @@ -135,7 +137,9 @@ public: float m_fVelocityChange; }; +#ifdef CHECK_STRUCT_SIZES static_assert(sizeof(cVehicleParams) == 0x18, "cVehicleParams: error"); +#endif enum { /* -- cgit v1.2.3 From c798e1bacdaabaf140ff3904948fd7cec46c09bb Mon Sep 17 00:00:00 2001 From: bigbossbro08 Date: Sun, 10 May 2020 21:49:33 +0600 Subject: Fixed typos and made all assert functions optional --- src/audio/AudioManager.h | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'src/audio/AudioManager.h') diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h index 5f00eac4..3e20b993 100644 --- a/src/audio/AudioManager.h +++ b/src/audio/AudioManager.h @@ -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 { /* -- cgit v1.2.3