diff --git a/LEGO1/legoactor.cpp b/LEGO1/legoactor.cpp index c26cc1fc..7faa3b0d 100644 --- a/LEGO1/legoactor.cpp +++ b/LEGO1/legoactor.cpp @@ -1,3 +1,8 @@ #include "legoactor.h" DECOMP_SIZE_ASSERT(LegoActor, 0x78) + +// OFFSET: LEGO1 0x1002d110 STUB +LegoActor::LegoActor() +{ +} \ No newline at end of file diff --git a/LEGO1/legoactor.h b/LEGO1/legoactor.h index cc8778db..fe5e43a0 100644 --- a/LEGO1/legoactor.h +++ b/LEGO1/legoactor.h @@ -9,6 +9,8 @@ class LegoActor : public LegoEntity { public: + LegoActor(); + // OFFSET: LEGO1 0x1002d210 inline virtual const char *ClassName() const override // vtable+0x0c { diff --git a/LEGO1/pizza.cpp b/LEGO1/pizza.cpp index 7e153b26..047e34bb 100644 --- a/LEGO1/pizza.cpp +++ b/LEGO1/pizza.cpp @@ -1,13 +1,11 @@ #include "pizza.h" -#include "decomp.h" - DECOMP_SIZE_ASSERT(Pizza, 0x9c); // OFFSET: LEGO1 0x10037ef0 Pizza::Pizza() { - // FIXME: This inherits from LegoActor, probably why this isn't matching + this->m_unk7c = 0; this->m_unk80 = 0; this->m_unk84 = 0; this->m_unk88 = 0; diff --git a/LEGO1/pizza.h b/LEGO1/pizza.h index 34d781c9..d6909810 100644 --- a/LEGO1/pizza.h +++ b/LEGO1/pizza.h @@ -1,6 +1,8 @@ #ifndef PIZZA_H #define PIZZA_H +#include "decomp.h" + #include "isleactor.h" #include "mxcore.h" #include "mxomni.h" @@ -29,16 +31,17 @@ public: { 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; + undefined4 m_unk78; + undefined4 m_unk7c; + undefined4 m_unk80; + undefined4 m_unk84; + undefined4 m_unk88; + undefined4 m_unk8c; + undefined4 m_unk90; + undefined4 m_unk94; + undefined m_unk98; }; #endif // PIZZA_H