diff --git a/CMakeLists.txt b/CMakeLists.txt index fa4de1e5..8f0980d0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,6 +46,7 @@ add_library(lego1 SHARED LEGO1/jukeboxstate.cpp LEGO1/legoact2state.cpp LEGO1/legoactioncontrolpresenter.cpp + LEGO1/legoactor.cpp LEGO1/legoanimactor.cpp LEGO1/legoanimationmanager.cpp LEGO1/legoanimmmpresenter.cpp diff --git a/LEGO1/isleactor.cpp b/LEGO1/isleactor.cpp index ca286e37..a28afc6b 100644 --- a/LEGO1/isleactor.cpp +++ b/LEGO1/isleactor.cpp @@ -1 +1,4 @@ #include "isleactor.h" + +// NOTE: This is copied from base class LegoActor. IsleActor may in fact be larger but we don't know yet. +DECOMP_SIZE_ASSERT(IsleActor, 0x78) diff --git a/LEGO1/legoactor.cpp b/LEGO1/legoactor.cpp new file mode 100644 index 00000000..c26cc1fc --- /dev/null +++ b/LEGO1/legoactor.cpp @@ -0,0 +1,3 @@ +#include "legoactor.h" + +DECOMP_SIZE_ASSERT(LegoActor, 0x78) diff --git a/LEGO1/legoactor.h b/LEGO1/legoactor.h index 9b23e943..828f48ad 100644 --- a/LEGO1/legoactor.h +++ b/LEGO1/legoactor.h @@ -1,6 +1,7 @@ #ifndef LEGOACTOR_H #define LEGOACTOR_H +#include "decomp.h" #include "legoentity.h" // VTABLE 0x100d6d68 @@ -20,6 +21,10 @@ class LegoActor : public LegoEntity { return !strcmp(name, LegoActor::ClassName()) || LegoEntity::IsA(name); } + +private: + undefined unk04_[0x68]; + }; #endif // LEGOACTOR_H diff --git a/LEGO1/pizza.cpp b/LEGO1/pizza.cpp index d4d5fd2f..93f67aaa 100644 --- a/LEGO1/pizza.cpp +++ b/LEGO1/pizza.cpp @@ -1,5 +1,9 @@ #include "pizza.h" +#include "decomp.h" + +DECOMP_SIZE_ASSERT(Pizza, 0x9c); + // OFFSET: LEGO1 0x10037ef0 Pizza::Pizza() { @@ -23,4 +27,4 @@ MxResult Pizza::Tickle() { // TODO return SUCCESS; -} \ No newline at end of file +} diff --git a/LEGO1/pizza.h b/LEGO1/pizza.h index 94a46936..34d781c9 100644 --- a/LEGO1/pizza.h +++ b/LEGO1/pizza.h @@ -30,12 +30,14 @@ class Pizza : public IsleActor return !strcmp(name, Pizza::ClassName()) || IsleActor::IsA(name); } private: + MxS32 m_unk78; MxS32 m_unk7c; MxS32 m_unk80; MxS32 m_unk84; MxS32 m_unk88; MxS32 m_unk8c; MxU32 m_unk90; + MxS32 m_unk94; MxS32 m_unk98; };