isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-24 08:41:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Match Isle::Notify

Browse Source
This commit is contained in:
Christian Semmler 2023-12-16 10:57:41 -05:00
parent 5d4ed7e6a2
commit c48cb8d2bc
2 changed files with 35 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
LEGO1/isle.cpp
View File

@ -96,42 +96,54 @@ MxResult Isle::Create(MxDSObject& p_dsObject)
// FUNCTION: LEGO1 0x10030c10 // FUNCTION: LEGO1 0x10030c10
MxLong Isle::Notify(MxParam& p_param) MxLong Isle::Notify(MxParam& p_param)
{ {
MxLong result = 0;
LegoWorld::Notify(p_param);
if (m_unk0xf6) { if (m_unk0xf6) {
switch (((MxNotificationParam&) p_param).GetNotification()) { switch (((MxNotificationParam&) p_param).GetNotification()) {
case c_notificationEndAction: case c_notificationEndAction:
return StopAction(p_param); result = StopAction(p_param);
break;
case c_notificationButtonUp: case c_notificationButtonUp:
case c_notificationButtonDown: case c_notificationButtonDown:
switch (m_act1state->GetUnknown18()) { switch (m_act1state->GetUnknown18()) {
case 3: case 3:
return m_pizza->Notify(p_param); result = m_pizza->Notify(p_param);
break;
case 10: case 10:
return m_ambulance->Notify(p_param); result = m_ambulance->Notify(p_param);
default: break;
return 0;
} }
break;
case TYPE17: case TYPE17:
return HandleType17Notification(p_param); result = HandleType17Notification(p_param);
break;
case TYPE18: case TYPE18:
switch (m_act1state->GetUnknown18()) { switch (m_act1state->GetUnknown18()) {
case 4: case 4:
return GetCurrentVehicle()->Notify(p_param); result = GetCurrentVehicle()->Notify(p_param);
break;
case 8: case 8:
return m_towtrack->Notify(p_param); result = m_towtrack->Notify(p_param);
break;
case 10: case 10:
return m_ambulance->Notify(p_param); result = m_ambulance->Notify(p_param);
break;
} }
break;
case TYPE19: case TYPE19:
return HandleType19Notification(p_param); result = HandleType19Notification(p_param);
break;
case TYPE20: case TYPE20:
VTable0x68(TRUE); VTable0x68(TRUE);
return 0; break;
case MXTRANSITIONMANAGER_TRANSITIONENDED: case MXTRANSITIONMANAGER_TRANSITIONENDED:
return HandleTransitionEnd(); result = HandleTransitionEnd();
break;
} }
} }
return 0; return result;
} }
// STUB: LEGO1 0x10030d90 // STUB: LEGO1 0x10030d90

19
LEGO1/isle.h
View File

@ -25,9 +25,7 @@ class Isle : public LegoWorld {
public: public:
Isle(); Isle();
virtual ~Isle() override; virtual ~Isle() override;
virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4 virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
MxLong StopAction(MxParam& p_param);
// FUNCTION: LEGO1 0x10030910 // FUNCTION: LEGO1 0x10030910
inline virtual const char* ClassName() const override // vtable+0x0c inline virtual const char* ClassName() const override // vtable+0x0c
@ -41,22 +39,25 @@ class Isle : public LegoWorld {
{ {
return !strcmp(p_name, Isle::ClassName()) || LegoWorld::IsA(p_name); return !strcmp(p_name, Isle::ClassName()) || LegoWorld::IsA(p_name);
} }
virtual MxResult Create(MxDSObject& p_dsObject) override; // vtable+0x18 virtual MxResult Create(MxDSObject& p_dsObject) override; // vtable+0x18
virtual void Stop() override; // vtable+50 virtual void Stop() override; // vtable+50
MxLong HandleType17Notification(MxParam& p_param); virtual void VTable0x58(MxCore* p_object) override; // vtable+58
MxLong HandleType19Notification(MxParam& p_param);
virtual void VTable0x58(MxCore* p_object) override; // vtable+58
// FUNCTION: LEGO1 0x10030900 // FUNCTION: LEGO1 0x10030900
virtual MxBool VTable0x5c() override { return TRUE; } // vtable+5c virtual MxBool VTable0x5c() override { return TRUE; } // vtable+5c
// FUNCTION: LEGO1 0x10033170 // FUNCTION: LEGO1 0x10033170
virtual void VTable0x60() override {} // vtable+60 virtual void VTable0x60() override {} // vtable+60
virtual MxBool VTable0x64() override; // vtable+64 virtual MxBool VTable0x64() override; // vtable+64
virtual void VTable0x68(MxBool p_add) override; // vtable+68 virtual void VTable0x68(MxBool p_add) override; // vtable+68
MxLong HandleTransitionEnd();
virtual void VTable0x6c(IslePathActor* p_actor); // vtable+6c virtual void VTable0x6c(IslePathActor* p_actor); // vtable+6c
inline void SetUnknown13c(MxU32 p_unk0x13c) { m_unk0x13c = p_unk0x13c; } inline void SetUnknown13c(MxU32 p_unk0x13c) { m_unk0x13c = p_unk0x13c; }
MxLong StopAction(MxParam& p_param);
MxLong HandleType17Notification(MxParam& p_param);
MxLong HandleType19Notification(MxParam& p_param);
MxLong HandleTransitionEnd();
protected: protected:
Act1State* m_act1state; // 0xf8 Act1State* m_act1state; // 0xf8
Pizza* m_pizza; // 0xfc Pizza* m_pizza; // 0xfc