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

Match

Browse Source
This commit is contained in:
Christian Semmler 2024-02-01 14:42:59 -05:00
parent 7d49a8471e
commit 1e8585b327
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -640,6 +640,8 @@ MxU8 Infocenter::HandleClick(LegoControlManagerEvent& p_param)
// FUNCTION: LEGO1 0x10070870 // FUNCTION: LEGO1 0x10070870
MxLong Infocenter::HandleNotification0(MxNotificationParam& p_param) MxLong Infocenter::HandleNotification0(MxNotificationParam& p_param)
{ {
MxLong result;
if (p_param.GetSender() == NULL) { if (p_param.GetSender() == NULL) {
if (m_infocenterState->GetUnknown0x74() == 8) { if (m_infocenterState->GetUnknown0x74() == 8) {
m_infoManDialogueTimer = 0; m_infoManDialogueTimer = 0;
@ -647,17 +649,15 @@ MxLong Infocenter::HandleNotification0(MxNotificationParam& p_param)
PlayAction(c_exitConfirmationDialogue); PlayAction(c_exitConfirmationDialogue);
} }
return 1; result = 1;
} }
else if (p_param.GetSender()->IsA("MxEntity") && m_infocenterState->GetUnknown0x74() != 5 && m_infocenterState->GetUnknown0x74() != 12) {
if (p_param.GetSender()->IsA("MxEntity") && m_infocenterState->GetUnknown0x74() != 5 &&
m_infocenterState->GetUnknown0x74() != 12) {
switch (((MxEntity*) p_param.GetSender())->GetEntityId()) { switch (((MxEntity*) p_param.GetSender())->GetEntityId()) {
case 5: { case 5: {
m_infoManDialogueTimer = 0; m_infoManDialogueTimer = 0;
LegoState::StateStruct& state = LegoState::StateStruct& state = !GameState()->GetUnknown10() ? m_infocenterState->GetUnknown0x08()
GameState()->GetUnknown10() ? m_infocenterState->GetUnknown0x14() : m_infocenterState->GetUnknown0x08(); : m_infocenterState->GetUnknown0x14();
InfomainScript objectId = (InfomainScript) state.FUN_10014d00(); InfomainScript objectId = (InfomainScript) state.FUN_10014d00();
PlayAction(objectId); PlayAction(objectId);
@ -697,12 +697,13 @@ MxLong Infocenter::HandleNotification0(MxNotificationParam& p_param)
m_currentInfomainScript == c_pizzaCtlDescription || m_currentInfomainScript == c_gasCtlDescription || m_currentInfomainScript == c_pizzaCtlDescription || m_currentInfomainScript == c_gasCtlDescription ||
m_currentInfomainScript == c_medCtlDescription || m_currentInfomainScript == c_copCtlDescription) { m_currentInfomainScript == c_medCtlDescription || m_currentInfomainScript == c_copCtlDescription) {
StopCurrentAction(); StopCurrentAction();
return 1; result = 1;
} }
} }
} }
return 1; result = 1;
return result;
} }
// FUNCTION: LEGO1 0x10070aa0 // FUNCTION: LEGO1 0x10070aa0