From 9ae2ce50e660812d4241c6b7491ea87fd31df4b2 Mon Sep 17 00:00:00 2001 From: Nathan Date: Mon, 23 Oct 2023 19:16:31 -0400 Subject: [PATCH] Fix some style issues --- LEGO1/act3.cpp | 2 ++ LEGO1/act3.h | 1 + LEGO1/helicopter.cpp | 2 ++ LEGO1/helicopter.h | 4 ++-- LEGO1/islepathactor.h | 2 +- 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/LEGO1/act3.cpp b/LEGO1/act3.cpp index eca84fbf..3d152bfc 100644 --- a/LEGO1/act3.cpp +++ b/LEGO1/act3.cpp @@ -1,5 +1,7 @@ #include "act3.h" +DECOMP_SIZE_ASSERT(Act3, 0x4274) + // OFFSET: LEGO1 0x10072270 STUB Act3::Act3() { diff --git a/LEGO1/act3.h b/LEGO1/act3.h index f2883e63..6bef1711 100644 --- a/LEGO1/act3.h +++ b/LEGO1/act3.h @@ -29,6 +29,7 @@ class Act3 : public LegoWorld protected: undefined m_unkf8[0x4114]; MxEntity *m_unk420c; + undefined m_unk4210[0x64]; }; diff --git a/LEGO1/helicopter.cpp b/LEGO1/helicopter.cpp index 5c80aba0..04195407 100644 --- a/LEGO1/helicopter.cpp +++ b/LEGO1/helicopter.cpp @@ -5,6 +5,8 @@ #include "legogamestate.h" #include "legoworld.h" +DECOMP_SIZE_ASSERT(Helicopter, 0x230) + // OFFSET: LEGO1 0x10001e60 Helicopter::Helicopter() { diff --git a/LEGO1/helicopter.h b/LEGO1/helicopter.h index a106a373..61cbd2cb 100644 --- a/LEGO1/helicopter.h +++ b/LEGO1/helicopter.h @@ -29,7 +29,7 @@ class Helicopter : public IslePathActor // OFFSET: LEGO1 0x10003210 TEMPLATE // Helicopter::`scalar deleting destructor' - virtual ~Helicopter(); // vtable+0x0 + virtual ~Helicopter() override; // vtable+0x0 protected: MxMatrixData m_unk160; @@ -42,7 +42,7 @@ class Helicopter : public IslePathActor MxAtomId m_unk22c; private: - void Helicopter::GetState(); + void GetState(); }; #endif // HELICOPTER_H diff --git a/LEGO1/islepathactor.h b/LEGO1/islepathactor.h index 902cfe04..be10d349 100644 --- a/LEGO1/islepathactor.h +++ b/LEGO1/islepathactor.h @@ -27,7 +27,7 @@ class IslePathActor : public LegoPathActor // OFFSET: LEGO1 0x10002ff0 TEMPLATE // IslePathActor::`scalar deleting destructor' - inline virtual ~IslePathActor() + inline virtual ~IslePathActor() override { IslePathActor::Destroy(TRUE); }