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

Fixes/matches

Browse Source
This commit is contained in:
Christian Semmler 2024-01-20 09:19:10 -05:00
parent a248c006da
commit 8d2489ba3f
6 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,7 +38,7 @@ class InfocenterDoor : public LegoWorld {
// InfocenterDoor::`scalar deleting destructor' // InfocenterDoor::`scalar deleting destructor'
private: private:
MxS32 m_unk0xf8; MxS32 m_unk0xf8; // 0xf8
}; };
#endif // INFOCENTERDOOR_H #endif // INFOCENTERDOOR_H

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

@ -28,7 +28,7 @@ class LegoControlManager : public MxCore {
void FUN_10028df0(MxPresenterList* p_presenterList); void FUN_10028df0(MxPresenterList* p_presenterList);
void Register(MxCore* p_listener); void Register(MxCore* p_listener);
void Unregister(MxCore* p_listener); void Unregister(MxCore* p_listener);
void FUN_100293c0(undefined4, const MxAtomId&, undefined2); void FUN_100293c0(undefined4, const char*, undefined2);
// SYNTHETIC: LEGO1 0x10028d40 // SYNTHETIC: LEGO1 0x10028d40
// LegoControlManager::`scalar deleting destructor' // LegoControlManager::`scalar deleting destructor'

2
LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp
View File

@ -31,7 +31,7 @@ void LegoControlManager::Unregister(MxCore* p_listener)
} }
// STUB: LEGO1 0x100293c0 // STUB: LEGO1 0x100293c0
void LegoControlManager::FUN_100293c0(undefined4, const MxAtomId&, undefined2) void LegoControlManager::FUN_100293c0(undefined4, const char*, undefined2)
{ {
} }

1
LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp
View File

@ -59,6 +59,7 @@ MxLong ElevatorBottom::Notify(MxParam& p_param)
break; break;
} }
} }
return ret; return ret;
} }

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

@ -35,7 +35,7 @@ Infocenter::Infocenter()
m_currentInfomainScript = c_noInfomain; m_currentInfomainScript = c_noInfomain;
m_currentCutscene = e_noIntro; m_currentCutscene = e_noIntro;
memset(&m_entries, 0, sizeof(InfocenterUnkDataEntry) * 7); memset(&m_entries, 0, sizeof(m_entries));
m_unk0x1c8 = -1; m_unk0x1c8 = -1;
SetAppCursor(1); SetAppCursor(1);
@ -198,7 +198,7 @@ MxLong Infocenter::HandleEndAction(MxParam& p_param)
return result; return result;
if (action->GetObjectId() == c_returnBackGuidanceDialogue2) { if (action->GetObjectId() == c_returnBackGuidanceDialogue2) {
ControlManager()->FUN_100293c0(0x10, action->GetAtomId(), 0); ControlManager()->FUN_100293c0(0x10, action->GetAtomId().GetInternal(), 0);
m_unk0x1d6 = 0; m_unk0x1d6 = 0;
} }
@ -472,23 +472,18 @@ MxResult Infocenter::Tickle()
if (m_unk0x1d6 != 0) { if (m_unk0x1d6 != 0) {
m_unk0x1d6 += 100; m_unk0x1d6 += 100;
if (m_unk0x1d6 > 3400 && m_unk0x1d6 < 3650) { if (m_unk0x1d6 > 3400 && m_unk0x1d6 < 3650) {
ControlManager()->FUN_100293c0(0x10, m_atom, 1); ControlManager()->FUN_100293c0(0x10, m_atom.GetInternal(), 1);
return SUCCESS;
} }
else if (m_unk0x1d6 > 3650 && m_unk0x1d6 < 3900) {
if (m_unk0x1d6 > 3650 && m_unk0x1d6 < 3900) { ControlManager()->FUN_100293c0(0x10, m_atom.GetInternal(), 0);
ControlManager()->FUN_100293c0(0x10, m_atom, 0);
return SUCCESS;
} }
else if (m_unk0x1d6 > 3900 && m_unk0x1d6 < 4150) {
if (m_unk0x1d6 > 3900 && m_unk0x1d6 < 4150) { ControlManager()->FUN_100293c0(0x10, m_atom.GetInternal(), 1);
ControlManager()->FUN_100293c0(0x10, m_atom, 1);
return SUCCESS;
} }
else if (4400 < m_unk0x1d6) {
if (4400 < m_unk0x1d6) { ControlManager()->FUN_100293c0(0x10, m_atom.GetInternal(), 0);
ControlManager()->FUN_100293c0(0x10, m_atom, 0);
m_unk0x1d6 = 0; m_unk0x1d6 = 0;
} }
} }

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

@ -6,6 +6,8 @@
#include "legoomni.h" #include "legoomni.h"
#include "mxnotificationmanager.h" #include "mxnotificationmanager.h"
DECOMP_SIZE_ASSERT(InfocenterDoor, 0xfc)
// FUNCTION: LEGO1 0x10037730 // FUNCTION: LEGO1 0x10037730
InfocenterDoor::InfocenterDoor() InfocenterDoor::InfocenterDoor()
{ {