From afbf1cf8637b3ec141b9a49904ca309cdb6b04f9 Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Mon, 5 Feb 2024 11:51:08 -0500 Subject: [PATCH] Fix another bug --- LEGO1/lego/legoomni/include/infocenter.h | 2 +- LEGO1/lego/legoomni/src/infocenter/infocenter.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/LEGO1/lego/legoomni/include/infocenter.h b/LEGO1/lego/legoomni/include/infocenter.h index 564ca720..416254f2 100644 --- a/LEGO1/lego/legoomni/include/infocenter.h +++ b/LEGO1/lego/legoomni/include/infocenter.h @@ -144,7 +144,7 @@ class Infocenter : public LegoWorld { c_gasCtlDescription = 555, c_medCtlDescription = 556, - c_unk557 = 557, + c_infoCtlDescription = 557, c_boatCtlDescription = 558, c_copCtlDescription = 559, c_pizzaCtlDescription = 560, diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp index 9d679dfb..df8a408e 100644 --- a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp +++ b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp @@ -407,7 +407,6 @@ void Infocenter::InitializeBitmaps() ((MxPresenter*) Find(m_atom, c_gasCtl))->Enable(TRUE); ((MxPresenter*) Find(m_atom, c_medCtl))->Enable(TRUE); ((MxPresenter*) Find(m_atom, c_copCtl))->Enable(TRUE); - ((MxPresenter*) Find(m_atom, c_mamaCtl))->Enable(TRUE); ((MxPresenter*) Find(m_atom, c_papaCtl))->Enable(TRUE); ((MxPresenter*) Find(m_atom, c_pepperCtl))->Enable(TRUE); @@ -780,6 +779,7 @@ MxU8 Infocenter::HandleClick(LegoControlManagerEvent& p_param) break; case c_infoCtl: + actionToPlay = c_infoCtlDescription; m_radio.Stop(); break; case c_doorCtl: @@ -810,7 +810,7 @@ MxU8 Infocenter::HandleClick(LegoControlManagerEvent& p_param) actionToPlay = c_medCtlDescription; m_radio.Stop(); break; - case c_copCtlDescription: + case c_copCtl: actionToPlay = c_copCtlDescription; m_radio.Stop(); break; @@ -917,7 +917,7 @@ MxLong Infocenter::HandleNotification0(MxNotificationParam& p_param) if (sender->IsA("Radio") && m_radio.GetState()->IsActive()) { if (m_currentInfomainScript == c_mamaMovie || m_currentInfomainScript == c_papaMovie || m_currentInfomainScript == c_pepperMovie || m_currentInfomainScript == c_nickMovie || - m_currentInfomainScript == c_lauraMovie || m_currentInfomainScript == c_unk557 || + m_currentInfomainScript == c_lauraMovie || m_currentInfomainScript == c_infoCtlDescription || m_currentInfomainScript == c_boatCtlDescription || m_currentInfomainScript == c_raceCtlDescription || m_currentInfomainScript == c_pizzaCtlDescription || m_currentInfomainScript == c_gasCtlDescription || m_currentInfomainScript == c_medCtlDescription || m_currentInfomainScript == c_copCtlDescription) {