From ad90e1c750e913b6eabc03c19917961904d46112 Mon Sep 17 00:00:00 2001 From: jonschz Date: Thu, 12 Sep 2024 21:42:48 +0200 Subject: [PATCH] Address review comments --- .../legoomni/include/legocarbuildpresenter.h | 46 +++++++++---------- .../src/build/legocarbuildpresenter.cpp | 2 +- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/LEGO1/lego/legoomni/include/legocarbuildpresenter.h b/LEGO1/lego/legoomni/include/legocarbuildpresenter.h index cd2a4948..2dbfd20f 100644 --- a/LEGO1/lego/legoomni/include/legocarbuildpresenter.h +++ b/LEGO1/lego/legoomni/include/legocarbuildpresenter.h @@ -4,18 +4,18 @@ #include "anim/legoanim.h" #include "legoanimpresenter.h" -// SIZE 0xc -struct LegoCarBuildAnimPresenterUnknownListEntry { - LegoChar* m_unk0x00; // 0x00 - LegoChar* m_unk0x04; // 0x04 - undefined m_unk0x08[4]; // 0x08 -}; - // VTABLE: LEGO1 0x100d99e0 // VTABLE: BETA10 0x101bb988 // SIZE 0x150 class LegoCarBuildAnimPresenter : public LegoAnimPresenter { public: + // SIZE 0x0c + struct UnknownListEntry { + LegoChar* m_unk0x00; // 0x00 + LegoChar* m_unk0x04; // 0x04 + undefined m_unk0x08[4]; // 0x08 + }; + LegoCarBuildAnimPresenter(); ~LegoCarBuildAnimPresenter() override; // vtable+0x00 @@ -60,22 +60,22 @@ class LegoCarBuildAnimPresenter : public LegoAnimPresenter { // LegoCarBuildAnimPresenter::`scalar deleting destructor' private: - undefined2 m_unk0xbc; // 0xbc - MxS16 m_unk0xbe; // 0xbe - MxS16 m_unk0xc0; // 0xc0 - undefined4 m_unk0xc4; // 0xc4 - LegoAnim m_unk0xc8; // 0xc8 - MxMatrix m_unk0xe0; // 0xe0 - LegoCarBuildAnimPresenterUnknownListEntry* m_unk0x128; // 0x128 - undefined4 m_unk0x12c; // 0x12c - undefined4 m_unk0x130; // 0x130 - undefined4 m_unk0x134; // 0x134 - undefined4 m_unk0x138; // 0x138 - undefined4 m_unk0x13c; // 0x13c - LegoEntity* m_unk0x140; // 0x140 - MxS32 m_unk0x144; // 0x144 - MxS32 m_unk0x148; // 0x148 - undefined* m_unk0x14c; // 0x14c + undefined2 m_unk0xbc; // 0xbc + MxS16 m_unk0xbe; // 0xbe + MxS16 m_unk0xc0; // 0xc0 + undefined4 m_unk0xc4; // 0xc4 + LegoAnim m_unk0xc8; // 0xc8 + MxMatrix m_unk0xe0; // 0xe0 + UnknownListEntry* m_unk0x128; // 0x128 + undefined4 m_unk0x12c; // 0x12c + undefined4 m_unk0x130; // 0x130 + undefined4 m_unk0x134; // 0x134 + undefined4 m_unk0x138; // 0x138 + undefined4 m_unk0x13c; // 0x13c + LegoEntity* m_unk0x140; // 0x140 + MxS32 m_unk0x144; // 0x144 + MxS32 m_unk0x148; // 0x148 + undefined* m_unk0x14c; // 0x14c }; #endif // LEGOCARBUILDPRESENTER_H diff --git a/LEGO1/lego/legoomni/src/build/legocarbuildpresenter.cpp b/LEGO1/lego/legoomni/src/build/legocarbuildpresenter.cpp index d5a785c8..193c5ee4 100644 --- a/LEGO1/lego/legoomni/src/build/legocarbuildpresenter.cpp +++ b/LEGO1/lego/legoomni/src/build/legocarbuildpresenter.cpp @@ -3,7 +3,7 @@ #include "legoentity.h" #include "mxautolock.h" -DECOMP_SIZE_ASSERT(LegoCarBuildAnimPresenterUnknownListEntry, 0xc) +DECOMP_SIZE_ASSERT(LegoCarBuildAnimPresenter::UnknownListEntry, 0x0c) DECOMP_SIZE_ASSERT(LegoCarBuildAnimPresenter, 0x150) // FUNCTION: LEGO1 0x10078400