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

update all PlayMusic() calls to use jukebox enum

Browse Source
This commit is contained in:
Ramen2X 2024-01-20 12:24:30 -05:00
parent b43c91d7df
commit a7e5faa403
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
LEGO1/lego/legoomni/src/build/helicopter.cpp
View File

@ -3,6 +3,7 @@
#include "act1state.h" #include "act1state.h"
#include "act3.h" #include "act3.h"
#include "isle.h" #include "isle.h"
#include "jukebox.h"
#include "legoanimationmanager.h" #include "legoanimationmanager.h"
#include "legocontrolmanager.h" #include "legocontrolmanager.h"
#include "legogamestate.h" #include "legogamestate.h"
@ -102,7 +103,7 @@ MxU32 Helicopter::VTable0xcc()
FUN_10015820(TRUE, 0); FUN_10015820(TRUE, 0);
TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 50, FALSE, TRUE); TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 50, FALSE, TRUE);
SetUnknownDC(4); SetUnknownDC(4);
PlayMusic(9); PlayMusic(JukeBox::e_jail);
break; break;
case 1: case 1:
m_script = *g_act2mainScript; m_script = *g_act2mainScript;

3
LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp
View File

@ -1,5 +1,6 @@
#include "elevatorbottom.h" #include "elevatorbottom.h"
#include "jukebox.h"
#include "legocontrolmanager.h" #include "legocontrolmanager.h"
#include "legogamestate.h" #include "legogamestate.h"
#include "legoinputmanager.h" #include "legoinputmanager.h"
@ -67,7 +68,7 @@ MxLong ElevatorBottom::Notify(MxParam& p_param)
void ElevatorBottom::VTable0x50() void ElevatorBottom::VTable0x50()
{ {
LegoWorld::VTable0x50(); LegoWorld::VTable0x50();
PlayMusic(11); PlayMusic(JukeBox::e_informationCenter);
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
} }

3
LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp
View File

@ -1,5 +1,6 @@
#include "infocenterdoor.h" #include "infocenterdoor.h"
#include "jukebox.h"
#include "legocontrolmanager.h" #include "legocontrolmanager.h"
#include "legogamestate.h" #include "legogamestate.h"
#include "legoinputmanager.h" #include "legoinputmanager.h"
@ -55,7 +56,7 @@ MxLong InfocenterDoor::Notify(MxParam& p_param)
void InfocenterDoor::VTable0x50() void InfocenterDoor::VTable0x50()
{ {
LegoWorld::VTable0x50(); LegoWorld::VTable0x50();
PlayMusic(11); PlayMusic(JukeBox::e_informationCenter);
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
} }

5
LEGO1/lego/legoomni/src/infocenter/score.cpp
View File

@ -2,6 +2,7 @@
#include "ambulancemissionstate.h" #include "ambulancemissionstate.h"
#include "gifmanager.h" #include "gifmanager.h"
#include "jukebox.h"
#include "legocontrolmanager.h" #include "legocontrolmanager.h"
#include "legogamestate.h" #include "legogamestate.h"
#include "legoinputmanager.h" #include "legoinputmanager.h"
@ -119,7 +120,7 @@ MxLong Score::FUN_10001510(MxEndActionNotificationParam& p_param)
TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 0x32, 0, 0); TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 0x32, 0, 0);
break; break;
case 0x1f5: case 0x1f5:
PlayMusic(11); PlayMusic(JukeBox::e_informationCenter);
m_state->SetTutorialFlag(FALSE); m_state->SetTutorialFlag(FALSE);
} }
} }
@ -145,7 +146,7 @@ void Score::VTable0x50()
Start(&action); Start(&action);
} }
else else
PlayMusic(11); PlayMusic(JukeBox::e_informationCenter);
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
} }