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

Match LegoWorld::Tickle

Browse Source
This commit is contained in:
Christian Semmler 2023-12-29 13:00:33 -05:00
parent 5269d9fe34
commit ada95e0904
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
LEGO1/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 = 0; m_unk0xf6 = FALSE;
m_unk0xf4 = 4; m_unk0xf4 = 4;
NotificationManager()->Register(this); NotificationManager()->Register(this);
} }
@ -101,14 +101,17 @@ void LegoWorld::VTable0x68(MxBool p_add)
// FUNCTION: LEGO1 0x10022080 // FUNCTION: LEGO1 0x10022080
MxResult LegoWorld::Tickle() MxResult LegoWorld::Tickle()
{ {
if (m_unk0xf6 == 0) { if (!m_unk0xf6) {
if (m_unk0xf4 == 0) { switch (m_unk0xf4) {
m_unk0xf6 = 1; case 0:
m_unk0xf6 = TRUE;
SetAppCursor(0); SetAppCursor(0);
Stop(); Stop();
return TRUE; return TRUE;
} case 2:
if (m_unk0xf4 != 2 && FUN_100220e0() != 1) { if (FUN_100220e0() == 1)
break;
default:
m_unk0xf4--; m_unk0xf4--;
} }
} }
@ -116,7 +119,7 @@ MxResult LegoWorld::Tickle()
} }
// STUB: LEGO1 0x100220e0 // STUB: LEGO1 0x100220e0
undefined4 LegoWorld::FUN_100220e0() undefined LegoWorld::FUN_100220e0()
{ {
return TRUE; return TRUE;
} }

4
LEGO1/legoworld.h
View File

@ -44,7 +44,7 @@ class LegoWorld : public LegoEntity {
inline LegoCameraController* GetCamera() { return m_camera; } inline LegoCameraController* GetCamera() { return m_camera; }
undefined4 LegoWorld::FUN_100220e0(); undefined FUN_100220e0();
MxResult SetAsCurrentWorld(MxDSObject& p_dsObject); MxResult SetAsCurrentWorld(MxDSObject& p_dsObject);
void EndAction(MxCore* p_object); void EndAction(MxCore* p_object);
void FUN_1001fc80(IslePathActor* p_actor); void FUN_1001fc80(IslePathActor* p_actor);
@ -62,7 +62,7 @@ class LegoWorld : public LegoEntity {
MxPresenterList m_list0xb8; // 0xb8 MxPresenterList m_list0xb8; // 0xb8
undefined m_unk0xd0[0x24]; // 0xd0 undefined m_unk0xd0[0x24]; // 0xd0
MxS16 m_unk0xf4; // 0xf4 MxS16 m_unk0xf4; // 0xf4
undefined m_unk0xf6; // 0xf6 MxBool m_unk0xf6; // 0xf6
undefined m_unk0xf7; // 0xf7 undefined m_unk0xf7; // 0xf7
}; };