diff --git a/LEGO1/pizza.cpp b/LEGO1/pizza.cpp index e21a82ea..d4d5fd2f 100644 --- a/LEGO1/pizza.cpp +++ b/LEGO1/pizza.cpp @@ -12,22 +12,13 @@ Pizza::Pizza() this->m_unk90 = 0x80000000; } -// OFFSET: LEGO1 0x1002c7cf STUB -// MxS32 IsleActor::Notify(MxParam *) -// { -// // TODO -// return 0; -// } - // OFFSET: LEGO1 0x10038100 Pizza::~Pizza() { - // FIXME: some vtable call from tickle manager, unimplemented atm - delete this; + TickleManager()->Unregister(this); } - -// OFFSET: LEGO1 0x100388a0 STUB +// OFFSET: LEGO1 0x100388a0 MxResult Pizza::Tickle() { // TODO diff --git a/LEGO1/pizza.h b/LEGO1/pizza.h index 42638a4e..13d94045 100644 --- a/LEGO1/pizza.h +++ b/LEGO1/pizza.h @@ -1,9 +1,10 @@ #ifndef PIZZA_H #define PIZZA_H -#include "decomp.h" #include "isleactor.h" #include "mxcore.h" +#include "mxomni.h" +#include "mxticklemanager.h" #include "mxtypes.h" // VTABLE 0x100d7380 @@ -31,12 +32,12 @@ class Pizza : public IsleActor return !strcmp(name, Pizza::ClassName()) || IsleActor::IsA(name); } private: - undefined4 m_unk80; - undefined4 m_unk84; - undefined4 m_unk88; - undefined4 m_unk8c; - undefined4 m_unk90; - undefined4 m_unk98; + MxS32 m_unk80; + MxS32 m_unk84; + MxS32 m_unk88; + MxS32 m_unk8c; + MxS32 m_unk90; + MxS32 m_unk98; }; #endif // PIZZA_H