diff --git a/LEGO1/lego/legoomni/include/infocenter.h b/LEGO1/lego/legoomni/include/infocenter.h index 718196eb..19d70d7b 100644 --- a/LEGO1/lego/legoomni/include/infocenter.h +++ b/LEGO1/lego/legoomni/include/infocenter.h @@ -55,7 +55,6 @@ class InfocenterState : public LegoState { Playlist& GetExitDialogueAct1() { return m_exitDialogueAct1; } Playlist& GetExitDialogueAct23() { return m_exitDialogueAct23; } Playlist& GetReturnDialogue(LegoGameState::Act p_act) { return m_returnDialogue[p_act]; } - Playlist& GetLeaveDialogue(LegoGameState::Act p_act) { return m_leaveDialogue[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 b7299c5a..2b622c72 100644 --- a/LEGO1/lego/legoomni/src/worlds/infocenter.cpp +++ b/LEGO1/lego/legoomni/src/worlds/infocenter.cpp @@ -1058,8 +1058,7 @@ MxU8 Infocenter::HandleControl(LegoControlManagerNotificationParam& p_param) m_infocenterState->m_unk0x74 = 5; m_destLocation = state->GetPreviousArea(); actionToPlay = - (InfomainScript::Script) m_infocenterState->GetLeaveDialogue(GameState()->GetCurrentAct()) - .Next(); + (InfomainScript::Script) m_infocenterState->GetNextLeaveDialogue(); m_radio.Stop(); InputManager()->DisableInputProcessing(); InputManager()->SetUnknown336(TRUE); @@ -1082,8 +1081,7 @@ MxU8 Infocenter::HandleControl(LegoControlManagerNotificationParam& p_param) m_infocenterState->m_unk0x74 = 5; m_destLocation = state->m_previousArea; actionToPlay = (InfomainScript::Script) m_infocenterState - ->GetLeaveDialogue(GameState()->GetCurrentAct()) - .Next(); + ->GetNextLeaveDialogue(); m_radio.Stop(); InputManager()->DisableInputProcessing(); InputManager()->SetUnknown336(TRUE); @@ -1097,7 +1095,7 @@ MxU8 Infocenter::HandleControl(LegoControlManagerNotificationParam& p_param) m_infocenterState->m_unk0x74 = 5; m_destLocation = LegoGameState::e_act2main; actionToPlay = - (InfomainScript::Script) m_infocenterState->GetLeaveDialogue(GameState()->GetCurrentAct()).Next(); + (InfomainScript::Script) m_infocenterState->GetNextLeaveDialogue(); InputManager()->DisableInputProcessing(); InputManager()->SetUnknown336(TRUE); break; @@ -1105,7 +1103,7 @@ MxU8 Infocenter::HandleControl(LegoControlManagerNotificationParam& p_param) m_infocenterState->m_unk0x74 = 5; m_destLocation = LegoGameState::e_act3script; actionToPlay = - (InfomainScript::Script) m_infocenterState->GetLeaveDialogue(GameState()->GetCurrentAct()).Next(); + (InfomainScript::Script) m_infocenterState->GetNextLeaveDialogue(); InputManager()->DisableInputProcessing(); InputManager()->SetUnknown336(TRUE); break;