mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-24 00:44:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix regressions (#653)

Browse Source
This commit is contained in:
Ramen2X
2024-03-10 12:45:46 -04:00
committed by GitHub
parent 7fad763699
commit c28c2aeb52
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
LEGO1/lego/legoomni/src/isle/radiostate.cpp
View File

@@ -36,7 +36,7 @@ JukeboxScript::Script g_unk0x100f3230[14] = {
// GLOBAL: LEGO1 0x100f3268 // GLOBAL: LEGO1 0x100f3268
JukeboxScript::Script g_unk0x100f3268[9] = { JukeboxScript::Script g_unk0x100f3268[9] = {
JukeboxScript::c_CentralRoads_Music, JukeboxScript::c_CentralRoads_Music,
JukeboxScript::c_Beach_Music, JukeboxScript::c_BeachBlvd_Music,
JukeboxScript::c_ResidentalArea_Music, JukeboxScript::c_ResidentalArea_Music,
JukeboxScript::c_Radio1_Music, JukeboxScript::c_Radio1_Music,
JukeboxScript::c_Radio2_Music, JukeboxScript::c_Radio2_Music,

8
LEGO1/lego/legoomni/src/worlds/jukebox.cpp
View File

@@ -130,13 +130,13 @@ MxBool JukeBox::HandleClick(LegoControlManagerEvent& p_param)
presenter = (MxStillPresenter*) Find("MxStillPresenter", "Torpedos_Bitmap"); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Torpedos_Bitmap");
presenter->Enable(TRUE); presenter->Enable(TRUE);
break; break;
case JukeboxScript::c_Jail_Music: case JukeboxScript::c_MusicTheme3:
m_state->SetState(JukeboxScript::c_MusicTheme1); m_state->SetState(JukeboxScript::c_MusicTheme1);
presenter = (MxStillPresenter*) Find("MxStillPresenter", "Right_Bitmap"); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Right_Bitmap");
presenter->Enable(FALSE); presenter->Enable(FALSE);
break; break;
case JukeboxScript::c_Act2Cave: case JukeboxScript::c_Act2Cave:
m_state->SetState(JukeboxScript::c_Jail_Music); m_state->SetState(JukeboxScript::c_MusicTheme3);
presenter = (MxStillPresenter*) Find("MxStillPresenter", "Decal_Bitmap"); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Decal_Bitmap");
presenter->Enable(FALSE); presenter->Enable(FALSE);
presenter = (MxStillPresenter*) Find("MxStillPresenter", "Right_Bitmap"); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Right_Bitmap");
@@ -168,11 +168,11 @@ MxBool JukeBox::HandleClick(LegoControlManagerEvent& p_param)
case JukeboxwScript::c_Dfwd_Ctl: case JukeboxwScript::c_Dfwd_Ctl:
switch (m_state->GetState()) { switch (m_state->GetState()) {
case JukeboxScript::c_MusicTheme1: case JukeboxScript::c_MusicTheme1:
m_state->SetState(JukeboxScript::c_Jail_Music); m_state->SetState(JukeboxScript::c_MusicTheme3);
presenter = (MxStillPresenter*) Find("MxStillPresenter", "Right_Bitmap"); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Right_Bitmap");
presenter->Enable(TRUE); presenter->Enable(TRUE);
break; break;
case JukeboxScript::c_Jail_Music: case JukeboxScript::c_MusicTheme3:
m_state->SetState(JukeboxScript::c_Act2Cave); m_state->SetState(JukeboxScript::c_Act2Cave);
presenter = (MxStillPresenter*) Find("MxStillPresenter", "Right_Bitmap"); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Right_Bitmap");
presenter->Enable(FALSE); presenter->Enable(FALSE);