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

Fix

Browse Source
This commit is contained in:
Christian Semmler 2024-01-17 08:59:52 -05:00
parent 7af27088f8
commit cd62029c9d
1 changed files with 86 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -174,10 +174,9 @@ MxLong Infocenter::HandleEndAction(MxParam& p_param)
MxLong result = m_radio.Notify(p_param); MxLong result = m_radio.Notify(p_param);
if (result) if (result || (action->GetAtomId() != m_atom && action->GetAtomId() != *g_introScript))
return result; return result;
if (action->GetAtomId() == m_atom || action->GetAtomId() == *g_introScript) {
if (action->GetObjectId() == e_returnBack) { if (action->GetObjectId() == e_returnBack) {
ControlManager()->FUN_100293c0(0x10, action->GetAtomId(), 0); ControlManager()->FUN_100293c0(0x10, action->GetAtomId(), 0);
m_unk0x1d6 = 0; m_unk0x1d6 = 0;
@ -256,8 +255,8 @@ MxLong Infocenter::HandleEndAction(MxParam& p_param)
} }
break; break;
case 11: case 11:
if (m_infocenterState->GetInfocenterBufferElement(0) == 0 && m_currentInfomainScript != 28 && if (m_infocenterState->GetInfocenterBufferElement(0) == 0 && m_currentInfomainScript != 40 &&
m_currentInfomainScript != 29 && m_currentInfomainScript != 42 && m_currentInfomainScript != 43 && m_currentInfomainScript != 41 && m_currentInfomainScript != 42 && m_currentInfomainScript != 43 &&
m_currentInfomainScript != 44) { m_currentInfomainScript != 44) {
m_unk0x1d0 = 1; m_unk0x1d0 = 1;
PlayMusic(11); PlayMusic(11);
@ -273,7 +272,6 @@ MxLong Infocenter::HandleEndAction(MxParam& p_param)
} }
result = 1; result = 1;
}
return result; return result;
} }