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

Rename incorrect function name

Browse Source
This commit is contained in:
Misha 2024-01-12 16:30:09 -05:00
parent 93566f5b50
commit 008aed7c87
No known key found for this signature in database
GPG Key ID: 8441D12AEF33FED8
8 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LEGO1/lego/legoomni/include/infocenter.h
View File

@ -27,7 +27,7 @@ class Infocenter : public LegoWorld {
} }
virtual MxResult Create(MxDSObject& p_dsObject) override; // vtable+0x18 virtual MxResult Create(MxDSObject& p_dsObject) override; // vtable+0x18
virtual void Stop() override; // vtable+0x50 virtual void OnStartWorld() override; // vtable+0x50
virtual MxBool VTable0x5c() override; // vtable+0x5c virtual MxBool VTable0x5c() override; // vtable+0x5c
virtual MxBool VTable0x64() override; // vtable+0x64 virtual MxBool VTable0x64() override; // vtable+0x64
virtual void VTable0x68(MxBool p_add) override; // vtable+0x68 virtual void VTable0x68(MxBool p_add) override; // vtable+0x68

2
LEGO1/lego/legoomni/include/isle.h
View File

@ -41,7 +41,7 @@ class Isle : public LegoWorld {
} }
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 OnStartWorld() override; // vtable+50
virtual void VTable0x58(MxCore* p_object) override; // vtable+58 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

4
LEGO1/lego/legoomni/include/legoworld.h
View File

@ -33,7 +33,7 @@ class LegoWorld : public LegoEntity {
return !strcmp(p_name, LegoWorld::ClassName()) || LegoEntity::IsA(p_name); return !strcmp(p_name, LegoWorld::ClassName()) || LegoEntity::IsA(p_name);
} }
virtual void Stop(); // vtable+50 virtual void OnStartWorld(); // vtable+50
virtual void VTable0x54(); // vtable+54 virtual void VTable0x54(); // vtable+54
virtual void VTable0x58(MxCore* p_object); // vtable+58 virtual void VTable0x58(MxCore* p_object); // vtable+58
virtual MxBool VTable0x5c(); // vtable+5c virtual MxBool VTable0x5c(); // vtable+5c
@ -65,7 +65,7 @@ class LegoWorld : public LegoEntity {
undefined4 m_unk0xec; // 0xec undefined4 m_unk0xec; // 0xec
undefined4 m_unk0xf0; // 0xf0 undefined4 m_unk0xf0; // 0xf0
MxS16 m_unk0xf4; // 0xf4 MxS16 m_unk0xf4; // 0xf4
MxBool m_unk0xf6; // 0xf6 MxBool m_worldStarted; // 0xf6
undefined m_unk0xf7; // 0xf7 undefined m_unk0xf7; // 0xf7
}; };

2
LEGO1/lego/legoomni/include/score.h
View File

@ -32,7 +32,7 @@ class Score : public LegoWorld {
// Score::`scalar deleting destructor' // Score::`scalar deleting destructor'
virtual MxResult Create(MxDSObject& p_dsObject) override; // vtable+18 virtual MxResult Create(MxDSObject& p_dsObject) override; // vtable+18
virtual void Stop() override; // vtable+50 virtual void OnStartWorld() override; // vtable+50
virtual MxBool VTable0x5c() override; // vtable+5c virtual MxBool VTable0x5c() override; // vtable+5c
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

12
LEGO1/lego/legoomni/src/entity/legoworld.cpp
View File

@ -15,7 +15,7 @@ DECOMP_SIZE_ASSERT(LegoWorld, 0xf8);
LegoWorld::LegoWorld() : m_list0x68(TRUE) LegoWorld::LegoWorld() : m_list0x68(TRUE)
{ {
// TODO // TODO
m_unk0xf6 = FALSE; m_worldStarted = FALSE;
m_unk0xf4 = 4; m_unk0xf4 = 4;
NotificationManager()->Register(this); NotificationManager()->Register(this);
} }
@ -101,12 +101,12 @@ void LegoWorld::VTable0x68(MxBool p_add)
// FUNCTION: LEGO1 0x10022080 // FUNCTION: LEGO1 0x10022080
MxResult LegoWorld::Tickle() MxResult LegoWorld::Tickle()
{ {
if (!m_unk0xf6) { if (!m_worldStarted) {
switch (m_unk0xf4) { switch (m_unk0xf4) {
case 0: case 0:
m_unk0xf6 = TRUE; m_worldStarted = TRUE;
SetAppCursor(0); SetAppCursor(0);
Stop(); OnStartWorld();
return TRUE; return TRUE;
case 2: case 2:
if (FUN_100220e0() == 1) if (FUN_100220e0() == 1)
@ -121,11 +121,11 @@ MxResult LegoWorld::Tickle()
// STUB: LEGO1 0x100220e0 // STUB: LEGO1 0x100220e0
undefined LegoWorld::FUN_100220e0() undefined LegoWorld::FUN_100220e0()
{ {
return TRUE; return 0;
} }
// FUNCTION: LEGO1 0x10022340 // FUNCTION: LEGO1 0x10022340
void LegoWorld::Stop() void LegoWorld::OnStartWorld()
{ {
TickleManager()->UnregisterClient(this); TickleManager()->UnregisterClient(this);
} }

2
LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
View File

@ -26,7 +26,7 @@ MxLong Infocenter::Notify(MxParam& p_param)
} }
// STUB: LEGO1 0x1006f4e0 // STUB: LEGO1 0x1006f4e0
void Infocenter::Stop() void Infocenter::OnStartWorld()
{ {
// TODO // TODO
} }

6
LEGO1/lego/legoomni/src/infocenter/score.cpp
View File

@ -76,7 +76,7 @@ MxLong Score::Notify(MxParam& p_param)
{ {
MxLong ret = 0; MxLong ret = 0;
LegoWorld::Notify(p_param); LegoWorld::Notify(p_param);
if (m_unk0xf6) { if (m_worldStarted) {
switch (((MxNotificationParam&) p_param).GetNotification()) { switch (((MxNotificationParam&) p_param).GetNotification()) {
case c_notificationStartAction: case c_notificationStartAction:
ret = 1; ret = 1;
@ -128,9 +128,9 @@ MxLong Score::FUN_10001510(MxEndActionNotificationParam& p_param)
} }
// FUNCTION: LEGO1 0x10001580 // FUNCTION: LEGO1 0x10001580
void Score::Stop() void Score::OnStartWorld()
{ {
LegoWorld::Stop(); LegoWorld::OnStartWorld();
MxDSAction action; MxDSAction action;
action.SetObjectId(0x1f4); action.SetObjectId(0x1f4);

4
LEGO1/lego/legoomni/src/isle/isle.cpp
View File

@ -99,7 +99,7 @@ MxLong Isle::Notify(MxParam& p_param)
MxLong result = 0; MxLong result = 0;
LegoWorld::Notify(p_param); LegoWorld::Notify(p_param);
if (m_unk0xf6) { if (m_worldStarted) {
switch (((MxNotificationParam&) p_param).GetNotification()) { switch (((MxNotificationParam&) p_param).GetNotification()) {
case c_notificationEndAction: case c_notificationEndAction:
result = StopAction(p_param); result = StopAction(p_param);
@ -153,7 +153,7 @@ MxLong Isle::StopAction(MxParam& p_param)
} }
// STUB: LEGO1 0x10030fc0 // STUB: LEGO1 0x10030fc0
void Isle::Stop() void Isle::OnStartWorld()
{ {
// TODO // TODO
} }