From d3aa1665417b5ccdd1b2277786cefeceae3b38d3 Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Mon, 5 Feb 2024 11:18:00 -0500 Subject: [PATCH] Move code --- .../legoomni/src/infocenter/infocenter.cpp | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp index 8a11dd45..32d667b6 100644 --- a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp +++ b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp @@ -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); switch (m_unk0x11c->GetAction()->GetObjectId()) { + case c_pepperSelected: + m_selectedCharacter = e_pepper; + break; case c_mamaSelected: m_selectedCharacter = e_mama; break; case c_papaSelected: m_selectedCharacter = e_papa; break; - case c_pepperSelected: - m_selectedCharacter = e_pepper; - break; case c_nickSelected: m_selectedCharacter = e_nick; break; @@ -569,6 +569,14 @@ MxU8 Infocenter::HandleButtonUp(MxS32 p_x, MxS32 p_y) m_infoManDialogueTimer = 0; 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: if (m_selectedCharacter == e_mama) { m_radio.Stop(); @@ -585,14 +593,6 @@ MxU8 Infocenter::HandleButtonUp(MxS32 p_x, MxS32 p_y) m_unk0x1d4++; } break; - case c_pepperCtl: - if (m_selectedCharacter == e_pepper) { - m_radio.Stop(); - BackgroundAudioManager()->Stop(); - PlayAction(c_pepperMovie); - m_unk0x1d4++; - } - break; case c_nickCtl: if (m_selectedCharacter == e_nick) { m_radio.Stop();