diff --git a/LEGO1/lego/legoomni/include/infocenter.h b/LEGO1/lego/legoomni/include/infocenter.h index 19d70d7b..f8b3ae45 100644 --- a/LEGO1/lego/legoomni/include/infocenter.h +++ b/LEGO1/lego/legoomni/include/infocenter.h @@ -51,10 +51,14 @@ class InfocenterState : public LegoState { return (InfomainScript::Script) m_leaveDialogue[GameState()->GetCurrentAct()].Next(); } + InfomainScript::Script GetNextReturnDialogue() + { + return (InfomainScript::Script) m_returnDialogue[GameState()->GetCurrentAct()].Next(); + } + // TODO: These probably don't exist according to BETA Playlist& GetExitDialogueAct1() { return m_exitDialogueAct1; } Playlist& GetExitDialogueAct23() { return m_exitDialogueAct23; } - Playlist& GetReturnDialogue(LegoGameState::Act p_act) { return m_returnDialogue[p_act]; } Playlist& GetBricksterDialogue() { return m_bricksterDialogue; } // SYNTHETIC: LEGO1 0x10071900 diff --git a/LEGO1/lego/legoomni/src/worlds/infocenter.cpp b/LEGO1/lego/legoomni/src/worlds/infocenter.cpp index 671fbf7c..457a0563 100644 --- a/LEGO1/lego/legoomni/src/worlds/infocenter.cpp +++ b/LEGO1/lego/legoomni/src/worlds/infocenter.cpp @@ -471,8 +471,7 @@ void Infocenter::ReadyWorld() default: { PlayMusic(JukeboxScript::c_InformationCenter_Music); - InfomainScript::Script script = - (InfomainScript::Script) m_infocenterState->GetReturnDialogue(GameState()->GetCurrentAct()).Next(); + InfomainScript::Script script = m_infocenterState->GetNextReturnDialogue(); PlayAction(script); if (script == InfomainScript::c_iicx26in_RunAnim) { @@ -537,8 +536,7 @@ void Infocenter::ReadyWorld() m_infocenterState->m_unk0x74 = 5; m_destLocation = LegoGameState::e_act2main; - InfomainScript::Script script = - (InfomainScript::Script) m_infocenterState->GetReturnDialogue(GameState()->GetCurrentAct()).Next(); + InfomainScript::Script script = m_infocenterState->GetNextReturnDialogue(); PlayAction(script); InputManager()->DisableInputProcessing(); @@ -547,8 +545,7 @@ void Infocenter::ReadyWorld() } PlayMusic(JukeboxScript::c_InformationCenter_Music); - InfomainScript::Script script = - (InfomainScript::Script) m_infocenterState->GetReturnDialogue(GameState()->GetCurrentAct()).Next(); + InfomainScript::Script script = m_infocenterState->GetNextReturnDialogue(); PlayAction(script); bgRed->Enable(TRUE); break; @@ -593,8 +590,7 @@ void Infocenter::ReadyWorld() m_infocenterState->m_unk0x74 = 5; m_destLocation = LegoGameState::e_act3script; - InfomainScript::Script script = - (InfomainScript::Script) m_infocenterState->GetReturnDialogue(GameState()->GetCurrentAct()).Next(); + InfomainScript::Script script = m_infocenterState->GetNextReturnDialogue(); PlayAction(script); InputManager()->DisableInputProcessing(); @@ -603,8 +599,7 @@ void Infocenter::ReadyWorld() } PlayMusic(JukeboxScript::c_InformationCenter_Music); - InfomainScript::Script script = - (InfomainScript::Script) m_infocenterState->GetReturnDialogue(GameState()->GetCurrentAct()).Next(); + InfomainScript::Script script = m_infocenterState->GetNextReturnDialogue(); PlayAction(script); bgRed->Enable(TRUE); break; @@ -1228,6 +1223,7 @@ MxLong Infocenter::HandleNotification0(MxNotificationParam& p_param) } // FUNCTION: LEGO1 0x10070aa0 +// FUNCTION: BETA10 0x10030508 void Infocenter::Enable(MxBool p_enable) { LegoWorld::Enable(p_enable);