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

Browse Source
This commit is contained in:
Christian Semmler 2024-02-01 15:01:21 -05:00
parent 32c365daad
commit 21245d813e
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -640,19 +640,17 @@ 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; MxCore* sender = p_param.GetSender();
if (p_param.GetSender() == NULL) { if (sender == NULL) {
if (m_infocenterState->GetUnknown0x74() == 8) { if (m_infocenterState->GetUnknown0x74() == 8) {
m_infoManDialogueTimer = 0; m_infoManDialogueTimer = 0;
StopCutscene(); StopCutscene();
PlayAction(c_exitConfirmationDialogue); PlayAction(c_exitConfirmationDialogue);
} }
result = 1;
} }
else if (p_param.GetSender()->IsA("MxEntity") && m_infocenterState->GetUnknown0x74() != 5 && m_infocenterState->GetUnknown0x74() != 12) { else if (sender->IsA("MxEntity") && m_infocenterState->GetUnknown0x74() != 5 && m_infocenterState->GetUnknown0x74() != 12) {
switch (((MxEntity*) p_param.GetSender())->GetEntityId()) { switch (((MxEntity*) sender)->GetEntityId()) {
case 5: { case 5: {
m_infoManDialogueTimer = 0; m_infoManDialogueTimer = 0;
@ -691,7 +689,7 @@ MxLong Infocenter::HandleNotification0(MxNotificationParam& p_param)
} }
} }
else { else {
if (p_param.GetSender()->IsA("Radio") && m_radio.GetState()->IsActive()) { if (sender->IsA("Radio") && m_radio.GetState()->IsActive()) {
if (m_currentInfomainScript == c_unk40 || m_currentInfomainScript == c_unk41 || if (m_currentInfomainScript == c_unk40 || m_currentInfomainScript == c_unk41 ||
m_currentInfomainScript == c_unk42 || m_currentInfomainScript == c_unk43 || m_currentInfomainScript == c_unk42 || m_currentInfomainScript == c_unk43 ||
m_currentInfomainScript == c_unk44 || m_currentInfomainScript == c_unk557 || m_currentInfomainScript == c_unk44 || m_currentInfomainScript == c_unk557 ||
@ -699,13 +697,11 @@ 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();
result = 1;
} }
} }
} }
result = 1; return 1;
return result;
} }
// FUNCTION: LEGO1 0x10070aa0 // FUNCTION: LEGO1 0x10070aa0