diff --git a/LEGO1/lego/legoomni/include/isleactor.h b/LEGO1/lego/legoomni/include/isleactor.h index 3bc978ad..063b6c39 100644 --- a/LEGO1/lego/legoomni/include/isleactor.h +++ b/LEGO1/lego/legoomni/include/isleactor.h @@ -31,25 +31,25 @@ class IsleActor : public LegoActor { MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18 // FUNCTION: LEGO1 0x1000e5f0 - virtual undefined4 HandleClick() { return 0; } // vtable+0x68 + virtual MxLong HandleClick() { return 0; } // vtable+0x68 // FUNCTION: LEGO1 0x1000e600 virtual undefined4 VTable0x6c() { return 0; } // vtable+0x6c // FUNCTION: LEGO1 0x1000e610 - virtual undefined4 HandleEndAnim() { return 0; } // vtable+0x70 + virtual MxLong HandleEndAnim() { return 0; } // vtable+0x70 // FUNCTION: LEGO1 0x1000e620 - virtual undefined4 HandleEndAction(MxEndActionNotificationParam&) { return 0; } // vtable+0x74 + virtual MxLong HandleEndAction(MxEndActionNotificationParam&) { return 0; } // vtable+0x74 // FUNCTION: LEGO1 0x1000e630 - virtual undefined4 HandleButtonDown(LegoControlManagerNotificationParam&) { return 0; } // vtable+0x78 + virtual MxLong HandleButtonDown(LegoControlManagerNotificationParam&) { return 0; } // vtable+0x78 // FUNCTION: LEGO1 0x1000e640 - virtual undefined4 HandleButtonUp(LegoControlManagerNotificationParam&) { return 0; } // vtable+0x7c + virtual MxLong HandleButtonUp(LegoControlManagerNotificationParam&) { return 0; } // vtable+0x7c // FUNCTION: LEGO1 0x1000e650 - virtual undefined4 HandlePathStruct(LegoPathStructNotificationParam&) { return 0; } // vtable+0x80 + virtual MxLong HandlePathStruct(LegoPathStructNotificationParam&) { return 0; } // vtable+0x80 protected: LegoWorld* m_world; // 0x78 diff --git a/LEGO1/lego/legoomni/include/pizza.h b/LEGO1/lego/legoomni/include/pizza.h index 7e01a540..664252b7 100644 --- a/LEGO1/lego/legoomni/include/pizza.h +++ b/LEGO1/lego/legoomni/include/pizza.h @@ -98,10 +98,10 @@ class Pizza : public IsleActor { return !strcmp(p_name, Pizza::ClassName()) || IsleActor::IsA(p_name); } - MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18 - undefined4 HandleClick() override; // vtable+0x68 - undefined4 HandleEndAction(MxEndActionNotificationParam&) override; // vtable+0x74 - undefined4 HandlePathStruct(LegoPathStructNotificationParam&) override; // vtable+0x80 + MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18 + MxLong HandleClick() override; // vtable+0x68 + MxLong HandleEndAction(MxEndActionNotificationParam&) override; // vtable+0x74 + MxLong HandlePathStruct(LegoPathStructNotificationParam&) override; // vtable+0x80 void CreateState(); void FUN_10038220(MxU32 p_objectId); diff --git a/LEGO1/lego/legoomni/include/pizzeria.h b/LEGO1/lego/legoomni/include/pizzeria.h index 2008f629..2a94abf6 100644 --- a/LEGO1/lego/legoomni/include/pizzeria.h +++ b/LEGO1/lego/legoomni/include/pizzeria.h @@ -68,7 +68,7 @@ class Pizzeria : public IsleActor { } MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18 - undefined4 HandleClick() override; // vtable+0x68 + MxLong HandleClick() override; // vtable+0x68 void CreateState(); diff --git a/LEGO1/lego/legoomni/src/actors/pizza.cpp b/LEGO1/lego/legoomni/src/actors/pizza.cpp index b22700d1..1ff18396 100644 --- a/LEGO1/lego/legoomni/src/actors/pizza.cpp +++ b/LEGO1/lego/legoomni/src/actors/pizza.cpp @@ -72,14 +72,14 @@ void Pizza::FUN_10038380() } // STUB: LEGO1 0x100383f0 -undefined4 Pizza::HandleClick() +MxLong Pizza::HandleClick() { // TODO return 0; } // STUB: LEGO1 0x100384f0 -undefined4 Pizza::HandlePathStruct(LegoPathStructNotificationParam&) +MxLong Pizza::HandlePathStruct(LegoPathStructNotificationParam&) { // TODO return 0; @@ -93,7 +93,7 @@ MxResult Pizza::Tickle() } // STUB: LEGO1 0x10038b10 -undefined4 Pizza::HandleEndAction(MxEndActionNotificationParam&) +MxLong Pizza::HandleEndAction(MxEndActionNotificationParam&) { // TODO return 0; diff --git a/LEGO1/lego/legoomni/src/actors/pizzeria.cpp b/LEGO1/lego/legoomni/src/actors/pizzeria.cpp index 68484768..3b61ddb7 100644 --- a/LEGO1/lego/legoomni/src/actors/pizzeria.cpp +++ b/LEGO1/lego/legoomni/src/actors/pizzeria.cpp @@ -46,7 +46,7 @@ void Pizzeria::CreateState() } // FUNCTION: LEGO1 0x10017a50 -undefined4 Pizzeria::HandleClick() +MxLong Pizzeria::HandleClick() { if (FUN_1003ef60() && m_pizzaMissionState->m_unk0x0c == 0) { if (UserActor()->GetActorId() != GameState()->GetActorId()) {