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

refactor jukebox

Browse Source
This commit is contained in:
Ramen2X 2024-03-09 21:33:56 -05:00
parent 9e06d71813
commit 189ac8b7e9
10 changed files with 78 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
LEGO1/lego/legoomni/include/jukebox.h
View File

@ -2,6 +2,8 @@
#define JUKEBOX_H #define JUKEBOX_H
#include "decomp.h" #include "decomp.h"
#include "jukebox_actions.h"
#include "jukeboxw_actions.h"
#include "jukeboxstate.h" #include "jukeboxstate.h"
#include "legocontrolmanager.h" #include "legocontrolmanager.h"
#include "legogamestate.h" #include "legogamestate.h"
@ -11,89 +13,6 @@
// SIZE 0x104 // SIZE 0x104
class JukeBox : public LegoWorld { class JukeBox : public LegoWorld {
public: public:
// JUKEBOXW.SI
enum JukeBoxWorldScript {
c_volDownCtl = 1,
c_volUpCtl = 2,
c_dBackCtl = 3,
c_dFwdCtl = 4,
c_noteCtl = 5
};
// JUKEBOX.SI (the actual audio)
enum JukeBoxScript {
e_mamaPapaBrickolini,
e_jailUnused,
e_act2Cave,
e_bricksterChase,
e_brickHunt,
e_residentialArea,
e_beachBlvd,
e_cave,
e_centralRoads,
e_jail,
e_hospital,
e_informationCenter,
e_policeStation,
e_park,
e_centralNorthRoad,
e_garageArea,
e_raceTrack,
e_beach,
e_quietChirping,
e_jetskiRace,
e_act3Pursuit,
e_legoRadioReminder1,
e_legoRadioJingle1,
e_legoRadioJingle2,
e_legoRadioJingle3,
e_legoRadioJingle4,
e_legoRadioReminder2,
e_legoRadioRacingAd,
e_legoRadioNews1,
e_legoRadioNews2,
e_legoRadioPizzaAd1,
e_legoRadioBricksterPSA,
e_legoRadioSports1,
e_legoRadioIntermission1,
e_legoRadioIntermission2,
e_legoRadioPizzaAd2,
e_legoRadioWeatherReport,
e_legoRadioSports2,
e_legoRadioPizzaAd3,
e_legoRadioIntermission3,
e_legoRadioSuperStoreAd,
e_legoRadioLuckyYou,
e_legoRadioJazzInterlude,
e_legoRadioPianoInterlude1,
e_legoRadioPoliceStation,
e_legoRadioPianoInterlude2,
e_legoRadioCredits,
e_helicopterBuild,
e_padding1,
e_duneBuggyBuild,
e_padding2,
e_jetskiBuild,
e_padding3,
e_raceCarBuild,
e_padding4,
e_jukeBoxMamaPapaBrickolini,
e_jukeBoxBrickByBrick,
e_jukeBoxTheBrickster,
e_jukeBoxBuildMeABridgeToday,
e_jukeBoxBaroqueInBrick,
e_jukeBoxMantaRay,
e_observationDeck,
e_elevator,
e_pizzaMission,
};
JukeBox(); JukeBox();
~JukeBox() override; ~JukeBox() override;

2
LEGO1/lego/legoomni/src/actors/helicopter.cpp
View File

@ -118,7 +118,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(JukeBox::e_jail); PlayMusic(JukeboxScript::c_Jail_Music);
break; break;
case LegoGameState::e_act2: case LegoGameState::e_act2:
m_script = *g_act2mainScript; m_script = *g_act2mainScript;

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

@ -6,44 +6,44 @@
#include "mxtimer.h" #include "mxtimer.h"
// GLOBAL: LEGO1 0x100f3218 // GLOBAL: LEGO1 0x100f3218
JukeBox::JukeBoxScript g_unk0x100f3218[6] = { JukeboxScript::Script g_unk0x100f3218[6] = {
JukeBox::e_legoRadioReminder1, JukeboxScript::c_sns002ra_Audio,
JukeBox::e_legoRadioJingle1, JukeboxScript::c_sns001ja_Audio,
JukeBox::e_legoRadioJingle2, JukeboxScript::c_snsc01js_Audio,
JukeBox::e_legoRadioJingle3, JukeboxScript::c_snsb01js_Audio,
JukeBox::e_legoRadioJingle4, JukeboxScript::c_snsa01js_Audio,
JukeBox::e_legoRadioReminder2 JukeboxScript::c_sns009ra_Audio
}; };
// GLOBAL: LEGO1 0x100f3230 // GLOBAL: LEGO1 0x100f3230
JukeBox::JukeBoxScript g_unk0x100f3230[14] = { JukeboxScript::Script g_unk0x100f3230[14] = {
JukeBox::e_legoRadioRacingAd, JukeboxScript::c_ham035ra_Audio,
JukeBox::e_legoRadioNews1, JukeboxScript::c_ham039ra_Audio,
JukeBox::e_legoRadioNews2, JukeboxScript::c_sns005ra_Audio,
JukeBox::e_legoRadioPizzaAd1, JukeboxScript::c_sns078pa_Audio,
JukeBox::e_legoRadioBricksterPSA, JukeboxScript::c_ham036ra_Audio,
JukeBox::e_legoRadioSports1, JukeboxScript::c_sns006ra_Audio,
JukeBox::e_legoRadioIntermission1, JukeboxScript::c_sns013ra_Audio,
JukeBox::e_legoRadioIntermission2, JukeboxScript::c_sns004ra_Audio,
JukeBox::e_legoRadioPizzaAd2, JukeboxScript::c_sns079pa_Audio,
JukeBox::e_legoRadioWeatherReport, JukeboxScript::c_sns007ra_Audio,
JukeBox::e_legoRadioSports2, JukeboxScript::c_sns008ra_Audio,
JukeBox::e_legoRadioPizzaAd3, JukeboxScript::c_hpz037ma_Audio,
JukeBox::e_legoRadioIntermission3, JukeboxScript::c_sns003ra_Audio,
JukeBox::e_legoRadioSuperStoreAd, JukeboxScript::c_sns010ra_Audio,
}; };
// GLOBAL: LEGO1 0x100f3268 // GLOBAL: LEGO1 0x100f3268
JukeBox::JukeBoxScript g_unk0x100f3268[9] = { JukeboxScript::Script g_unk0x100f3268[9] = {
JukeBox::e_centralRoads, JukeboxScript::c_CentralRoads_Music,
JukeBox::e_beachBlvd, JukeboxScript::c_Beach_Music,
JukeBox::e_residentialArea, JukeboxScript::c_ResidentalArea_Music,
JukeBox::e_legoRadioLuckyYou, JukeboxScript::c_Radio1_Music,
JukeBox::e_legoRadioJazzInterlude, JukeboxScript::c_Radio2_Music,
JukeBox::e_legoRadioPianoInterlude1, JukeboxScript::c_Radio3_Music,
JukeBox::e_legoRadioPoliceStation, JukeboxScript::c_Radio4_Music,
JukeBox::e_legoRadioPianoInterlude2, JukeboxScript::c_Radio5_Music,
JukeBox::e_legoRadioCredits, JukeboxScript::c_Radio6_Music,
}; };
// FUNCTION: LEGO1 0x1002ce10 // FUNCTION: LEGO1 0x1002ce10

2
LEGO1/lego/legoomni/src/worlds/elevatorbottom.cpp
View File

@ -72,7 +72,7 @@ MxLong ElevatorBottom::Notify(MxParam& p_param)
void ElevatorBottom::ReadyWorld() void ElevatorBottom::ReadyWorld()
{ {
LegoWorld::ReadyWorld(); LegoWorld::ReadyWorld();
PlayMusic(JukeBox::e_informationCenter); PlayMusic(JukeboxScript::c_InformationCenter_Music);
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
} }

2
LEGO1/lego/legoomni/src/worlds/historybook.cpp
View File

@ -143,7 +143,7 @@ void HistoryBook::ReadyWorld()
scoreY += 0x1b; scoreY += 0x1b;
} }
PlayMusic(JukeBox::e_informationCenter); PlayMusic(JukeboxScript::c_InformationCenter_Music);
} }
// FUNCTION: LEGO1 0x10082a10 // FUNCTION: LEGO1 0x10082a10

20
LEGO1/lego/legoomni/src/worlds/infocenter.cpp
View File

@ -204,7 +204,7 @@ MxLong Infocenter::HandleEndAction(MxEndActionNotificationParam& p_param)
} }
if (!m_unk0x1d4) { if (!m_unk0x1d4) {
PlayMusic(JukeBox::e_informationCenter); PlayMusic(JukeboxScript::c_InformationCenter_Music);
GameState()->SetActor(m_selectedCharacter); GameState()->SetActor(m_selectedCharacter);
switch (m_selectedCharacter) { switch (m_selectedCharacter) {
@ -319,7 +319,7 @@ MxLong Infocenter::HandleEndAction(MxEndActionNotificationParam& p_param)
m_currentInfomainScript != InfomainScript::c_Papa_All_Movie && m_currentInfomainScript != InfomainScript::c_Pepper_All_Movie && m_currentInfomainScript != InfomainScript::c_Papa_All_Movie && m_currentInfomainScript != InfomainScript::c_Pepper_All_Movie &&
m_currentInfomainScript != InfomainScript::c_Nick_All_Movie && m_currentInfomainScript != InfomainScript::c_Laura_All_Movie) { m_currentInfomainScript != InfomainScript::c_Nick_All_Movie && m_currentInfomainScript != InfomainScript::c_Laura_All_Movie) {
m_infoManDialogueTimer = 1; m_infoManDialogueTimer = 1;
PlayMusic(JukeBox::e_informationCenter); PlayMusic(JukeboxScript::c_InformationCenter_Music);
} }
m_infocenterState->SetUnknown0x74(2); m_infocenterState->SetUnknown0x74(2);
@ -364,12 +364,12 @@ void Infocenter::ReadyWorld()
} }
PlayAction(InfomainScript::c_iicx18in_RunAnim); PlayAction(InfomainScript::c_iicx18in_RunAnim);
PlayMusic(JukeBox::e_informationCenter); PlayMusic(JukeboxScript::c_InformationCenter_Music);
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
break; break;
case 5: case 5:
default: { default: {
PlayMusic(JukeBox::e_informationCenter); PlayMusic(JukeboxScript::c_InformationCenter_Music);
InfomainScript::Script script = InfomainScript::Script script =
(InfomainScript::Script) m_infocenterState->GetReturnDialogue(GameState()->GetCurrentAct()).Next(); (InfomainScript::Script) m_infocenterState->GetReturnDialogue(GameState()->GetCurrentAct()).Next();
@ -390,7 +390,7 @@ void Infocenter::ReadyWorld()
break; break;
} }
case 8: case 8:
PlayMusic(JukeBox::e_informationCenter); PlayMusic(JukeboxScript::c_InformationCenter_Music);
PlayAction(InfomainScript::c_iic043in_RunAnim); PlayAction(InfomainScript::c_iic043in_RunAnim);
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
break; break;
@ -401,14 +401,14 @@ void Infocenter::ReadyWorld()
} }
PlayAction(InfomainScript::c_iicx17in_RunAnim); PlayAction(InfomainScript::c_iicx17in_RunAnim);
PlayMusic(JukeBox::e_informationCenter); PlayMusic(JukeboxScript::c_InformationCenter_Music);
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
break; break;
} }
return; return;
case LegoGameState::e_act2: { case LegoGameState::e_act2: {
if (m_infocenterState->GetUnknown0x74() == 8) { if (m_infocenterState->GetUnknown0x74() == 8) {
PlayMusic(JukeBox::e_informationCenter); PlayMusic(JukeboxScript::c_InformationCenter_Music);
bgRed->Enable(TRUE); bgRed->Enable(TRUE);
PlayAction(InfomainScript::c_iic043in_RunAnim); PlayAction(InfomainScript::c_iic043in_RunAnim);
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
@ -446,7 +446,7 @@ void Infocenter::ReadyWorld()
return; return;
} }
PlayMusic(JukeBox::e_informationCenter); PlayMusic(JukeboxScript::c_InformationCenter_Music);
InfomainScript::Script script = InfomainScript::Script script =
(InfomainScript::Script) m_infocenterState->GetReturnDialogue(GameState()->GetCurrentAct()).Next(); (InfomainScript::Script) m_infocenterState->GetReturnDialogue(GameState()->GetCurrentAct()).Next();
PlayAction(script); PlayAction(script);
@ -455,7 +455,7 @@ void Infocenter::ReadyWorld()
} }
case LegoGameState::e_act3: { case LegoGameState::e_act3: {
if (m_infocenterState->GetUnknown0x74() == 8) { if (m_infocenterState->GetUnknown0x74() == 8) {
PlayMusic(JukeBox::e_informationCenter); PlayMusic(JukeboxScript::c_InformationCenter_Music);
bgRed->Enable(TRUE); bgRed->Enable(TRUE);
PlayAction(InfomainScript::c_iic043in_RunAnim); PlayAction(InfomainScript::c_iic043in_RunAnim);
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
@ -502,7 +502,7 @@ void Infocenter::ReadyWorld()
return; return;
} }
PlayMusic(JukeBox::e_informationCenter); PlayMusic(JukeboxScript::c_InformationCenter_Music);
InfomainScript::Script script = InfomainScript::Script script =
(InfomainScript::Script) m_infocenterState->GetReturnDialogue(GameState()->GetCurrentAct()).Next(); (InfomainScript::Script) m_infocenterState->GetReturnDialogue(GameState()->GetCurrentAct()).Next();
PlayAction(script); PlayAction(script);

2
LEGO1/lego/legoomni/src/worlds/infocenterdoor.cpp
View File

@ -82,7 +82,7 @@ MxLong InfocenterDoor::Notify(MxParam& p_param)
void InfocenterDoor::ReadyWorld() void InfocenterDoor::ReadyWorld()
{ {
LegoWorld::ReadyWorld(); LegoWorld::ReadyWorld();
PlayMusic(JukeBox::e_informationCenter); PlayMusic(JukeboxScript::c_InformationCenter_Music);
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
} }

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

@ -123,41 +123,41 @@ MxBool JukeBox::HandleClick(LegoControlManagerEvent& p_param)
if (p_param.GetUnknown0x28() == 1) { if (p_param.GetUnknown0x28() == 1) {
switch (p_param.GetClickedObjectId()) { switch (p_param.GetClickedObjectId()) {
case c_dBackCtl: case JukeboxwScript::c_Dback_Ctl:
switch (m_state->GetState()) { switch (m_state->GetState()) {
case JukeBoxScript::e_mamaPapaBrickolini: case JukeboxScript::c_MusicTheme1:
m_state->SetState(JukeBoxScript::e_residentialArea); m_state->SetState(JukeboxScript::c_ResidentalArea_Music);
presenter = (MxStillPresenter*) Find("MxStillPresenter", "Torpedos_Bitmap"); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Torpedos_Bitmap");
presenter->Enable(TRUE); presenter->Enable(TRUE);
break; break;
case JukeBoxScript::e_jailUnused: case JukeboxScript::c_Jail_Music:
m_state->SetState(JukeBoxScript::e_mamaPapaBrickolini); 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::e_act2Cave: case JukeboxScript::c_Act2Cave:
m_state->SetState(JukeBoxScript::e_jailUnused); m_state->SetState(JukeboxScript::c_Jail_Music);
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");
presenter->Enable(TRUE); presenter->Enable(TRUE);
break; break;
case JukeBoxScript::e_bricksterChase: case JukeboxScript::c_BrickstrChase:
m_state->SetState(JukeBoxScript::e_act2Cave); m_state->SetState(JukeboxScript::c_Act2Cave);
presenter = (MxStillPresenter*) Find("MxStillPresenter", "Wallis_Bitmap"); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Wallis_Bitmap");
presenter->Enable(FALSE); presenter->Enable(FALSE);
presenter = (MxStillPresenter*) Find("MxStillPresenter", "Decal_Bitmap"); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Decal_Bitmap");
presenter->Enable(TRUE); presenter->Enable(TRUE);
break; break;
case JukeBoxScript::e_brickHunt: case JukeboxScript::c_BrickHunt:
m_state->SetState(JukeBoxScript::e_bricksterChase); m_state->SetState(JukeboxScript::c_BrickstrChase);
presenter = (MxStillPresenter*) Find("MxStillPresenter", "Nelson_Bitmap"); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Nelson_Bitmap");
presenter->Enable(FALSE); presenter->Enable(FALSE);
presenter = (MxStillPresenter*) Find("MxStillPresenter", "Wallis_Bitmap"); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Wallis_Bitmap");
presenter->Enable(TRUE); presenter->Enable(TRUE);
break; break;
case JukeBoxScript::e_residentialArea: case JukeboxScript::c_ResidentalArea_Music:
m_state->SetState(JukeBoxScript::e_brickHunt); m_state->SetState(JukeboxScript::c_BrickHunt);
presenter = (MxStillPresenter*) Find("MxStillPresenter", "Torpedos_Bitmap"); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Torpedos_Bitmap");
presenter->Enable(FALSE); presenter->Enable(FALSE);
presenter = (MxStillPresenter*) Find("MxStillPresenter", "Nelson_Bitmap"); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Nelson_Bitmap");
@ -165,49 +165,49 @@ MxBool JukeBox::HandleClick(LegoControlManagerEvent& p_param)
break; break;
} }
break; break;
case JukeBoxWorldScript::c_dFwdCtl: case JukeboxwScript::c_Dfwd_Ctl:
switch (m_state->GetState()) { switch (m_state->GetState()) {
case JukeBoxScript::e_mamaPapaBrickolini: case JukeboxScript::c_MusicTheme1:
m_state->SetState(JukeBoxScript::e_jailUnused); m_state->SetState(JukeboxScript::c_Jail_Music);
presenter = (MxStillPresenter*) Find("MxStillPresenter", "Right_Bitmap"); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Right_Bitmap");
presenter->Enable(TRUE); presenter->Enable(TRUE);
break; break;
case JukeBoxScript::e_jailUnused: case JukeboxScript::c_Jail_Music:
m_state->SetState(JukeBoxScript::e_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);
presenter = (MxStillPresenter*) Find("MxStillPresenter", "Decal_Bitmap"); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Decal_Bitmap");
presenter->Enable(TRUE); presenter->Enable(TRUE);
break; break;
case JukeBoxScript::e_act2Cave: case JukeboxScript::c_Act2Cave:
m_state->SetState(JukeBoxScript::e_bricksterChase); m_state->SetState(JukeboxScript::c_BrickstrChase);
presenter = (MxStillPresenter*) Find("MxStillPresenter", "Decal_Bitmap"); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Decal_Bitmap");
presenter->Enable(FALSE); presenter->Enable(FALSE);
presenter = (MxStillPresenter*) Find("MxStillPresenter", "Wallis_Bitmap"); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Wallis_Bitmap");
presenter->Enable(TRUE); presenter->Enable(TRUE);
break; break;
case JukeBoxScript::e_bricksterChase: case JukeboxScript::c_BrickstrChase:
m_state->SetState(JukeBoxScript::e_brickHunt); m_state->SetState(JukeboxScript::c_BrickHunt);
presenter = (MxStillPresenter*) Find("MxStillPresenter", "Wallis_Bitmap"); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Wallis_Bitmap");
presenter->Enable(FALSE); presenter->Enable(FALSE);
presenter = (MxStillPresenter*) Find("MxStillPresenter", "Nelson_Bitmap"); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Nelson_Bitmap");
presenter->Enable(TRUE); presenter->Enable(TRUE);
break; break;
case JukeBoxScript::e_brickHunt: case JukeboxScript::c_BrickHunt:
m_state->SetState(JukeBoxScript::e_residentialArea); m_state->SetState(JukeboxScript::c_ResidentalArea_Music);
presenter = (MxStillPresenter*) Find("MxStillPresenter", "Nelson_Bitmap"); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Nelson_Bitmap");
presenter->Enable(FALSE); presenter->Enable(FALSE);
presenter = (MxStillPresenter*) Find("MxStillPresenter", "Torpedos_Bitmap"); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Torpedos_Bitmap");
presenter->Enable(TRUE); presenter->Enable(TRUE);
break; break;
case JukeBoxScript::e_residentialArea: case JukeboxScript::c_ResidentalArea_Music:
m_state->SetState(JukeBoxScript::e_mamaPapaBrickolini); m_state->SetState(JukeboxScript::c_MusicTheme1);
presenter = (MxStillPresenter*) Find("MxStillPresenter", "Torpedos_Bitmap"); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Torpedos_Bitmap");
presenter->Enable(FALSE); presenter->Enable(FALSE);
break; break;
} }
break; break;
case JukeBoxWorldScript::c_noteCtl: case JukeboxwScript::c_Note_Ctl:
LegoGameState* gameState = GameState(); LegoGameState* gameState = GameState();
Act1State* act1State = (Act1State*) gameState->GetState("Act1State"); Act1State* act1State = (Act1State*) gameState->GetState("Act1State");
act1State->SetUnknown18(11); act1State->SetUnknown18(11);

2
LEGO1/lego/legoomni/src/worlds/police.cpp
View File

@ -94,7 +94,7 @@ MxLong Police::Notify(MxParam& p_param)
void Police::ReadyWorld() void Police::ReadyWorld()
{ {
LegoWorld::ReadyWorld(); LegoWorld::ReadyWorld();
PlayMusic(JukeBox::e_policeStation); PlayMusic(JukeboxScript::c_PoliceStation_Music);
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
} }

4
LEGO1/lego/legoomni/src/worlds/score.cpp
View File

@ -125,7 +125,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(JukeBox::e_informationCenter); PlayMusic(JukeboxScript::c_InformationCenter_Music);
m_state->SetTutorialFlag(FALSE); m_state->SetTutorialFlag(FALSE);
} }
} }
@ -151,7 +151,7 @@ void Score::ReadyWorld()
Start(&action); Start(&action);
} }
else { else {
PlayMusic(JukeBox::e_informationCenter); PlayMusic(JukeboxScript::c_InformationCenter_Music);
} }
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);