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

Move code

Browse Source
This commit is contained in:
Christian Semmler 2024-02-05 11:18:00 -05:00
parent ca249b96d1
commit d3aa166541
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -548,15 +548,15 @@ MxU8 Infocenter::HandleButtonUp(MxS32 p_x, MxS32 p_y)
MxControlPresenter* control = InputManager()->GetControlManager()->FUN_100294e0(p_x - 1, p_y - 1); MxControlPresenter* control = InputManager()->GetControlManager()->FUN_100294e0(p_x - 1, p_y - 1);
switch (m_unk0x11c->GetAction()->GetObjectId()) { switch (m_unk0x11c->GetAction()->GetObjectId()) {
case c_pepperSelected:
m_selectedCharacter = e_pepper;
break;
case c_mamaSelected: case c_mamaSelected:
m_selectedCharacter = e_mama; m_selectedCharacter = e_mama;
break; break;
case c_papaSelected: case c_papaSelected:
m_selectedCharacter = e_papa; m_selectedCharacter = e_papa;
break; break;
case c_pepperSelected:
m_selectedCharacter = e_pepper;
break;
case c_nickSelected: case c_nickSelected:
m_selectedCharacter = e_nick; m_selectedCharacter = e_nick;
break; break;
@ -569,6 +569,14 @@ MxU8 Infocenter::HandleButtonUp(MxS32 p_x, MxS32 p_y)
m_infoManDialogueTimer = 0; m_infoManDialogueTimer = 0;
switch (control->GetAction()->GetObjectId()) { switch (control->GetAction()->GetObjectId()) {
case c_pepperCtl:
if (m_selectedCharacter == e_pepper) {
m_radio.Stop();
BackgroundAudioManager()->Stop();
PlayAction(c_pepperMovie);
m_unk0x1d4++;
}
break;
case c_mamaCtl: case c_mamaCtl:
if (m_selectedCharacter == e_mama) { if (m_selectedCharacter == e_mama) {
m_radio.Stop(); m_radio.Stop();
@ -585,14 +593,6 @@ MxU8 Infocenter::HandleButtonUp(MxS32 p_x, MxS32 p_y)
m_unk0x1d4++; m_unk0x1d4++;
} }
break; break;
case c_pepperCtl:
if (m_selectedCharacter == e_pepper) {
m_radio.Stop();
BackgroundAudioManager()->Stop();
PlayAction(c_pepperMovie);
m_unk0x1d4++;
}
break;
case c_nickCtl: case c_nickCtl:
if (m_selectedCharacter == e_nick) { if (m_selectedCharacter == e_nick) {
m_radio.Stop(); m_radio.Stop();