diff options
| author | bigbossbro08 <bigbossbro08@gmail.com> | 2020-05-10 18:04:36 +0200 |
|---|---|---|
| committer | bigbossbro08 <bigbossbro08@gmail.com> | 2020-05-10 18:04:36 +0200 |
| commit | b4abb6ddd8c2daee13cc9f83f17286fdf286c798 (patch) | |
| tree | 95cbe05e3986b98723dd1bced71ac78b1405fb97 /src/core | |
| parent | Fixed typos and made all assert functions optional (diff) | |
| download | re3-b4abb6ddd8c2daee13cc9f83f17286fdf286c798.tar re3-b4abb6ddd8c2daee13cc9f83f17286fdf286c798.tar.gz re3-b4abb6ddd8c2daee13cc9f83f17286fdf286c798.tar.bz2 re3-b4abb6ddd8c2daee13cc9f83f17286fdf286c798.tar.lz re3-b4abb6ddd8c2daee13cc9f83f17286fdf286c798.tar.xz re3-b4abb6ddd8c2daee13cc9f83f17286fdf286c798.tar.zst re3-b4abb6ddd8c2daee13cc9f83f17286fdf286c798.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/Camera.h | 20 | ||||
| -rw-r--r-- | src/core/Radar.cpp | 2 |
2 files changed, 1 insertions, 21 deletions
diff --git a/src/core/Camera.h b/src/core/Camera.h index b197aed3..94bcbd23 100644 --- a/src/core/Camera.h +++ b/src/core/Camera.h @@ -262,10 +262,6 @@ public: }; VALIDATE_SIZE(CCam, 0x1A4); -#ifdef CHECK_STRUCT_SIZES -static_assert(offsetof(CCam, Alpha) == 0xA8, "CCam: error"); -static_assert(offsetof(CCam, Front) == 0x140, "CCam: error"); -#endif class CCamPathSplines { @@ -641,21 +637,7 @@ uint32 unknown; // some counter having to do with music bool IsBoxVisible(RwV3d *box, const CMatrix *mat); }; -#ifdef CHECK_STRUCT_SIZES -static_assert(offsetof(CCamera, DistanceToWater) == 0xe4, "CCamera: error"); -static_assert(offsetof(CCamera, m_WideScreenOn) == 0x70, "CCamera: error"); -static_assert(offsetof(CCamera, WorldViewerBeingUsed) == 0x75, "CCamera: error"); -static_assert(offsetof(CCamera, m_uiNumberOfTrainCamNodes) == 0x84, "CCamera: error"); -static_assert(offsetof(CCamera, m_uiTransitionState) == 0x89, "CCamera: error"); -static_assert(offsetof(CCamera, m_uiTimeTransitionStart) == 0x94, "CCamera: error"); -static_assert(offsetof(CCamera, m_BlurBlue) == 0x9C, "CCamera: error"); -static_assert(offsetof(CCamera, Cams) == 0x1A4, "CCamera: error"); -static_assert(offsetof(CCamera, pToGarageWeAreIn) == 0x690, "CCamera: error"); -static_assert(offsetof(CCamera, m_PreviousCameraPosition) == 0x6B0, "CCamera: error"); -static_assert(offsetof(CCamera, m_vecCutSceneOffset) == 0x6F8, "CCamera: error"); -static_assert(offsetof(CCamera, m_arrPathArray) == 0x7a8, "CCamera: error"); -static_assert(sizeof(CCamera) == 0xE9D8, "CCamera: wrong size"); -#endif +VALIDATE_SIZE(CCamera, 0xE9D8); extern CCamera TheCamera; diff --git a/src/core/Radar.cpp b/src/core/Radar.cpp index ac2712c9..9406f1bd 100644 --- a/src/core/Radar.cpp +++ b/src/core/Radar.cpp @@ -76,9 +76,7 @@ CSprite2d *CRadar::RadarSprites[RADAR_SPRITE_COUNT] = { #define RADAR_NUM_TILES (8) #define RADAR_TILE_SIZE (RADAR_SIZE_X / RADAR_NUM_TILES) -#ifdef CHECK_STRUCT_SIZES static_assert(RADAR_TILE_SIZE == (RADAR_SIZE_Y / RADAR_NUM_TILES), "CRadar: not a square"); -#endif #define RADAR_MIN_RANGE (120.0f) #define RADAR_MAX_RANGE (350.0f) |