isledecomp/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2024-11-22 23:48:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

implement GasStation::Notify (#574)

Browse source 
* implement GasStation::Notify

* Fix code

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
This commit is contained in:
Joshua Peisach 2024-02-17 12:23:09 -05:00 committed by GitHub
parent 1d189b013d
commit d71987b369
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 77 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
LEGO1/lego/legoomni/include/gasstation.h
View file

@ -3,12 +3,12 @@
#include "decomp.h" #include "decomp.h"
#include "gasstationstate.h" #include "gasstationstate.h"
#include "legogamestate.h"
#include "legoworld.h" #include "legoworld.h"
#include "radio.h" #include "radio.h"
// VTABLE: LEGO1 0x100d4650 // VTABLE: LEGO1 0x100d4650
// SIZE 0x128 // SIZE 0x128
// Radio variable at 0x46, in constructor
class GasStation : public LegoWorld { class GasStation : public LegoWorld {
public: public:
GasStation(); GasStation();
@ -30,28 +30,33 @@ class GasStation : public LegoWorld {
return !strcmp(p_name, GasStation::ClassName()) || LegoWorld::IsA(p_name); return !strcmp(p_name, GasStation::ClassName()) || LegoWorld::IsA(p_name);
} }
MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18 MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
void ReadyWorld() override; // vtable+0x50 void ReadyWorld() override; // vtable+0x50
MxBool VTable0x5c() override; // vtable+0x5c MxBool VTable0x5c() override; // vtable+0x5c
MxBool VTable0x64() override; // vtable+0x64 MxBool VTable0x64() override; // vtable+0x64
void Enable(MxBool p_enable) override; // vtable+0x68 void Enable(MxBool p_enable) override; // vtable+0x68
virtual MxLong HandleClick(LegoControlManagerEvent& p_param); // vtable+0x6c
// SYNTHETIC: LEGO1 0x100048a0 // SYNTHETIC: LEGO1 0x100048a0
// GasStation::`scalar deleting destructor' // GasStation::`scalar deleting destructor'
private: private:
undefined2 m_unk0xf8; // 0xf8 MxLong HandleEndAction(MxEndActionNotificationParam& p_param);
undefined2 m_unk0xfa; // 0xfa MxLong HandleKeyPress(MxS8 p_key);
undefined4 m_unk0xfc; // 0xfc MxLong HandleButtonDown(LegoControlManagerEvent& p_param);
GasStationState* m_state; // 0x100
undefined2 m_unk0x104; // 0x104 undefined2 m_unk0xf8; // 0xf8
undefined2 m_unk0x106; // 0x106 undefined2 m_unk0xfa; // 0xfa
undefined4 m_unk0x108; // 0x108 LegoGameState::Area m_transitionDestination; // 0xfc
undefined4 m_unk0x10c; // 0x10c GasStationState* m_state; // 0x100
undefined4 m_unk0x110; // 0x110 undefined2 m_unk0x104; // 0x104
undefined m_unk0x114; // 0x114 undefined2 m_unk0x106; // 0x106
undefined m_unk0x115; // 0x115 undefined4 m_unk0x108; // 0x108
Radio m_radio; // 0x118 undefined4 m_unk0x10c; // 0x10c
undefined4 m_unk0x110; // 0x110
undefined m_unk0x114; // 0x114
undefined m_unk0x115; // 0x115
Radio m_radio; // 0x118
}; };
#endif // GASSTATION_H #endif // GASSTATION_H

59
LEGO1/lego/legoomni/src/gasstation/gasstation.cpp
View file

@ -15,7 +15,7 @@ GasStation::GasStation()
{ {
m_unk0xf8 = 0; m_unk0xf8 = 0;
m_state = NULL; m_state = NULL;
m_unk0xfc = 0; m_transitionDestination = LegoGameState::e_noArea;
m_unk0x108 = 0; m_unk0x108 = 0;
m_unk0x104 = 0; m_unk0x104 = 0;
m_unk0x114 = 0; m_unk0x114 = 0;
@ -81,12 +81,33 @@ MxResult GasStation::Create(MxDSAction& p_dsAction)
return result; return result;
} }
// STUB: LEGO1 0x10004a60 // FUNCTION: LEGO1 0x10004a60
MxLong GasStation::Notify(MxParam& p_param) MxLong GasStation::Notify(MxParam& p_param)
{ {
// TODO MxResult result = 0;
LegoWorld::Notify(p_param);
return 0; if (m_worldStarted) {
switch (((MxNotificationParam&) p_param).GetNotification()) {
case c_notificationEndAction:
result = HandleEndAction((MxEndActionNotificationParam&) p_param);
break;
case c_notificationKeyPress:
result = HandleKeyPress((((LegoEventNotificationParam&) p_param)).GetKey());
break;
case c_notificationButtonDown:
result = HandleButtonDown(((LegoControlManagerEvent&) p_param));
break;
case c_notificationClick:
result = HandleClick((LegoControlManagerEvent&) p_param);
break;
case c_notificationTransitioned:
GameState()->SwitchArea(m_transitionDestination);
break;
}
}
return result;
} }
// STUB: LEGO1 0x10004b30 // STUB: LEGO1 0x10004b30
@ -95,6 +116,34 @@ void GasStation::ReadyWorld()
// TODO // TODO
} }
// STUB: LEGO1 0x10005660
MxLong GasStation::HandleEndAction(MxEndActionNotificationParam& p_param)
{
// TODO
return 0;
}
// STUB: LEGO1 0x10005920
MxLong GasStation::HandleKeyPress(MxS8 p_key)
{
// TODO
return 0;
}
// STUB: LEGO1 0x10005960
MxLong GasStation::HandleButtonDown(LegoControlManagerEvent& p_param)
{
// TODO
return 0;
}
// STUB: LEGO1 0x10005b20
MxLong GasStation::HandleClick(LegoControlManagerEvent& p_param)
{
// TODO
return 0;
}
// FUNCTION: LEGO1 0x10005c40 // FUNCTION: LEGO1 0x10005c40
void GasStation::Enable(MxBool p_enable) void GasStation::Enable(MxBool p_enable)
{ {
@ -116,7 +165,7 @@ MxResult GasStation::Tickle()
{ {
// TODO // TODO
return 0; return SUCCESS;
} }
// STUB: LEGO1 0x10005e70 // STUB: LEGO1 0x10005e70