isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-21 07:11:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve match

Browse Source
This commit is contained in:
jonschz 2025-02-21 18:25:01 +01:00
parent 777dfa82ec
commit e04ae2b56e
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
LEGO1/lego/legoomni/include/infocenter.h
View File

@ -51,10 +51,14 @@ class InfocenterState : public LegoState {
return (InfomainScript::Script) m_leaveDialogue[GameState()->GetCurrentAct()].Next(); 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 // TODO: These probably don't exist according to BETA
Playlist& GetExitDialogueAct1() { return m_exitDialogueAct1; } Playlist& GetExitDialogueAct1() { return m_exitDialogueAct1; }
Playlist& GetExitDialogueAct23() { return m_exitDialogueAct23; } Playlist& GetExitDialogueAct23() { return m_exitDialogueAct23; }
Playlist& GetReturnDialogue(LegoGameState::Act p_act) { return m_returnDialogue[p_act]; }
Playlist& GetBricksterDialogue() { return m_bricksterDialogue; } Playlist& GetBricksterDialogue() { return m_bricksterDialogue; }
// SYNTHETIC: LEGO1 0x10071900 // SYNTHETIC: LEGO1 0x10071900

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

@ -471,8 +471,7 @@ void Infocenter::ReadyWorld()
default: { default: {
PlayMusic(JukeboxScript::c_InformationCenter_Music); PlayMusic(JukeboxScript::c_InformationCenter_Music);
InfomainScript::Script script = InfomainScript::Script script = m_infocenterState->GetNextReturnDialogue();
(InfomainScript::Script) m_infocenterState->GetReturnDialogue(GameState()->GetCurrentAct()).Next();
PlayAction(script); PlayAction(script);
if (script == InfomainScript::c_iicx26in_RunAnim) { if (script == InfomainScript::c_iicx26in_RunAnim) {
@ -537,8 +536,7 @@ void Infocenter::ReadyWorld()
m_infocenterState->m_unk0x74 = 5; m_infocenterState->m_unk0x74 = 5;
m_destLocation = LegoGameState::e_act2main; m_destLocation = LegoGameState::e_act2main;
InfomainScript::Script script = InfomainScript::Script script = m_infocenterState->GetNextReturnDialogue();
(InfomainScript::Script) m_infocenterState->GetReturnDialogue(GameState()->GetCurrentAct()).Next();
PlayAction(script); PlayAction(script);
InputManager()->DisableInputProcessing(); InputManager()->DisableInputProcessing();
@ -547,8 +545,7 @@ void Infocenter::ReadyWorld()
} }
PlayMusic(JukeboxScript::c_InformationCenter_Music); PlayMusic(JukeboxScript::c_InformationCenter_Music);
InfomainScript::Script script = InfomainScript::Script script = m_infocenterState->GetNextReturnDialogue();
(InfomainScript::Script) m_infocenterState->GetReturnDialogue(GameState()->GetCurrentAct()).Next();
PlayAction(script); PlayAction(script);
bgRed->Enable(TRUE); bgRed->Enable(TRUE);
break; break;
@ -593,8 +590,7 @@ void Infocenter::ReadyWorld()
m_infocenterState->m_unk0x74 = 5; m_infocenterState->m_unk0x74 = 5;
m_destLocation = LegoGameState::e_act3script; m_destLocation = LegoGameState::e_act3script;
InfomainScript::Script script = InfomainScript::Script script = m_infocenterState->GetNextReturnDialogue();
(InfomainScript::Script) m_infocenterState->GetReturnDialogue(GameState()->GetCurrentAct()).Next();
PlayAction(script); PlayAction(script);
InputManager()->DisableInputProcessing(); InputManager()->DisableInputProcessing();
@ -603,8 +599,7 @@ void Infocenter::ReadyWorld()
} }
PlayMusic(JukeboxScript::c_InformationCenter_Music); PlayMusic(JukeboxScript::c_InformationCenter_Music);
InfomainScript::Script script = InfomainScript::Script script = m_infocenterState->GetNextReturnDialogue();
(InfomainScript::Script) m_infocenterState->GetReturnDialogue(GameState()->GetCurrentAct()).Next();
PlayAction(script); PlayAction(script);
bgRed->Enable(TRUE); bgRed->Enable(TRUE);
break; break;
@ -1228,6 +1223,7 @@ MxLong Infocenter::HandleNotification0(MxNotificationParam& p_param)
} }
// FUNCTION: LEGO1 0x10070aa0 // FUNCTION: LEGO1 0x10070aa0
// FUNCTION: BETA10 0x10030508
void Infocenter::Enable(MxBool p_enable) void Infocenter::Enable(MxBool p_enable)
{ {
LegoWorld::Enable(p_enable); LegoWorld::Enable(p_enable);