diff --git a/LEGO1/lego/legoomni/include/gasstation.h b/LEGO1/lego/legoomni/include/gasstation.h index 6dfe9f32..d2b133b5 100644 --- a/LEGO1/lego/legoomni/include/gasstation.h +++ b/LEGO1/lego/legoomni/include/gasstation.h @@ -9,7 +9,6 @@ // VTABLE: LEGO1 0x100d4650 // SIZE 0x128 -// Radio variable at 0x46, in constructor class GasStation : public LegoWorld { public: GasStation(); @@ -31,12 +30,11 @@ class GasStation : public LegoWorld { return !strcmp(p_name, GasStation::ClassName()) || LegoWorld::IsA(p_name); } - MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18 - void ReadyWorld() override; // vtable+0x50 - MxBool VTable0x5c() override; // vtable+0x5c - MxBool VTable0x64() override; // vtable+0x64 - void Enable(MxBool p_enable) override; // vtable+0x68 - + MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18 + void ReadyWorld() override; // vtable+0x50 + MxBool VTable0x5c() override; // vtable+0x5c + MxBool VTable0x64() override; // vtable+0x64 + void Enable(MxBool p_enable) override; // vtable+0x68 virtual MxLong HandleClick(LegoControlManagerEvent& p_param); // vtable+0x6c // SYNTHETIC: LEGO1 0x100048a0 @@ -44,7 +42,7 @@ class GasStation : public LegoWorld { private: MxLong HandleEndAction(MxEndActionNotificationParam& p_param); - MxLong HandleKeyPress(LegoEventNotificationParam& p_param); + MxLong HandleKeyPress(MxS8 p_key); MxLong HandleButtonDown(LegoControlManagerEvent& p_param); undefined2 m_unk0xf8; // 0xf8 diff --git a/LEGO1/lego/legoomni/src/gasstation/gasstation.cpp b/LEGO1/lego/legoomni/src/gasstation/gasstation.cpp index 84d7b13e..1b938bcf 100644 --- a/LEGO1/lego/legoomni/src/gasstation/gasstation.cpp +++ b/LEGO1/lego/legoomni/src/gasstation/gasstation.cpp @@ -93,7 +93,7 @@ MxLong GasStation::Notify(MxParam& p_param) result = HandleEndAction((MxEndActionNotificationParam&) p_param); break; case c_notificationKeyPress: - result = HandleKeyPress(((LegoEventNotificationParam&) p_param)); + result = HandleKeyPress((((LegoEventNotificationParam&) p_param)).GetKey()); break; case c_notificationButtonDown: result = HandleButtonDown(((LegoControlManagerEvent&) p_param)); @@ -124,7 +124,7 @@ MxLong GasStation::HandleEndAction(MxEndActionNotificationParam& p_param) } // STUB: LEGO1 0x10005920 -MxLong GasStation::HandleKeyPress(LegoEventNotificationParam& p_param) +MxLong GasStation::HandleKeyPress(MxS8 p_key) { // TODO return 0; @@ -165,7 +165,7 @@ MxResult GasStation::Tickle() { // TODO - return 0; + return SUCCESS; } // STUB: LEGO1 0x10005e70