From c28c2aeb52f48743b40af840d3bd5787f2b83646 Mon Sep 17 00:00:00 2001 From: Ramen2X Date: Sun, 10 Mar 2024 12:45:46 -0400 Subject: [PATCH] fix regressions (#653) --- LEGO1/lego/legoomni/src/isle/radiostate.cpp | 2 +- LEGO1/lego/legoomni/src/worlds/jukebox.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/LEGO1/lego/legoomni/src/isle/radiostate.cpp b/LEGO1/lego/legoomni/src/isle/radiostate.cpp index a766e4b1..2fff7e41 100644 --- a/LEGO1/lego/legoomni/src/isle/radiostate.cpp +++ b/LEGO1/lego/legoomni/src/isle/radiostate.cpp @@ -36,7 +36,7 @@ JukeboxScript::Script g_unk0x100f3230[14] = { // GLOBAL: LEGO1 0x100f3268 JukeboxScript::Script g_unk0x100f3268[9] = { JukeboxScript::c_CentralRoads_Music, - JukeboxScript::c_Beach_Music, + JukeboxScript::c_BeachBlvd_Music, JukeboxScript::c_ResidentalArea_Music, JukeboxScript::c_Radio1_Music, JukeboxScript::c_Radio2_Music, diff --git a/LEGO1/lego/legoomni/src/worlds/jukebox.cpp b/LEGO1/lego/legoomni/src/worlds/jukebox.cpp index 60fd7397..47e16d1c 100644 --- a/LEGO1/lego/legoomni/src/worlds/jukebox.cpp +++ b/LEGO1/lego/legoomni/src/worlds/jukebox.cpp @@ -130,13 +130,13 @@ MxBool JukeBox::HandleClick(LegoControlManagerEvent& p_param) presenter = (MxStillPresenter*) Find("MxStillPresenter", "Torpedos_Bitmap"); presenter->Enable(TRUE); break; - case JukeboxScript::c_Jail_Music: + case JukeboxScript::c_MusicTheme3: m_state->SetState(JukeboxScript::c_MusicTheme1); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Right_Bitmap"); presenter->Enable(FALSE); break; case JukeboxScript::c_Act2Cave: - m_state->SetState(JukeboxScript::c_Jail_Music); + m_state->SetState(JukeboxScript::c_MusicTheme3); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Decal_Bitmap"); presenter->Enable(FALSE); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Right_Bitmap"); @@ -168,11 +168,11 @@ MxBool JukeBox::HandleClick(LegoControlManagerEvent& p_param) case JukeboxwScript::c_Dfwd_Ctl: switch (m_state->GetState()) { case JukeboxScript::c_MusicTheme1: - m_state->SetState(JukeboxScript::c_Jail_Music); + m_state->SetState(JukeboxScript::c_MusicTheme3); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Right_Bitmap"); presenter->Enable(TRUE); break; - case JukeboxScript::c_Jail_Music: + case JukeboxScript::c_MusicTheme3: m_state->SetState(JukeboxScript::c_Act2Cave); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Right_Bitmap"); presenter->Enable(FALSE);