diff options
| author | Pieter-Jan Briers <pieterjan.briers+git@gmail.com> | 2026-05-19 03:08:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-05-18 19:08:12 -0600 |
| commit | 3f24f432fee178f226cf47ff7f49510cd5336e26 (patch) | |
| tree | 101605fd66ea5f71cb9efa87a281f3bf74a3c341 /include/d | |
| parent | b3cf239301231cf6bd7838c4c18e1b6b73a981bc (diff) | |
Array size UB fixes (#3162)
* Array size UB fixes
* Fix ShieldD
* Another one
Diffstat (limited to 'include/d')
| -rw-r--r-- | include/d/d_camera.h | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/include/d/d_camera.h b/include/d/d_camera.h index f7a7132538..4f94779188 100644 --- a/include/d/d_camera.h +++ b/include/d/d_camera.h @@ -430,8 +430,7 @@ public: /* 0x1C */ f32 mFovy; /* 0x20 */ f32 mBank; /* 0x24 */ fopAc_ac_c* mRelActor; - /* 0x28 */ char mRelUseMask; - /* 0x29 */ char field_0x29; + /* 0x28 */ char mRelUseMask[4]; /* 0x2C */ int mTimer; /* 0x30 */ bool field_0x30; /* 0x34 */ cXyz mBasePos; @@ -512,7 +511,7 @@ public: /* 0x3C */ fopAc_ac_c* field_0x3c; /* 0x40 */ fopAc_ac_c* field_0x40; /* 0x44 */ fpc_ProcID field_0x44; - /* 0x48 */ char field_0x48; + /* 0x48 */ char field_0x48[4]; /* 0x4C */ int field_0x4c; }; @@ -527,11 +526,7 @@ public: /* 0x3C */ f32 field_0x3c; /* 0x40 */ fopAc_ac_c* mRelActor; /* 0x44 */ fpc_ProcID mRelActorID; - /* 0x48 */ char mRelUseMask; - /* 0x49 */ char field_0x49; - /* 0x4A */ char field_0x4a; - /* 0x4B */ char field_0x4b; - /* 0x4C */ u8 field_0x4c[4]; + /* 0x48 */ char mRelUseMask[8]; /* 0x50 */ int mTimer; /* 0x54 */ int mTransType; /* 0x58 */ f32 mCushion; @@ -682,8 +677,7 @@ public: /* 0x24 */ f32* field_0x24; /* 0x28 */ f32 field_0x28; /* 0x2C */ fopAc_ac_c* mRelActor; - /* 0x30 */ char mRelUseMask; - /* 0x31 */ char field_0x31; + /* 0x30 */ char mRelUseMask[4]; /* 0x34 */ int mTimer; /* 0x38 */ int field_0x38; /* 0x3C */ int mChoice; @@ -766,8 +760,7 @@ public: /* 0xAC */ f32 field_0xac; /* 0xB0 */ fopAc_ac_c* mRelActor; /* 0xB4 */ fpc_ProcID mRelActorID; - /* 0xB8 */ char mRelUseMask; - /* 0xB9 */ char field_0xb9; + /* 0xB8 */ char mRelUseMask[4]; /* 0xBC */ f32 mCushion; /* 0xC0 */ u32 field_0xc0[6]; }; |