From ad4c2e172378b4ee0b9e8df3469992cecc318f5c Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Wed, 7 Feb 2024 12:08:49 -0500 Subject: [PATCH] Match --- .../legoomni/src/infocenter/infocenter.cpp | 27 ++++++++++++++----- 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp index 5ff042ba..6c73769c 100644 --- a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp +++ b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp @@ -352,7 +352,7 @@ void Infocenter::ReadyWorld() case 3: PlayCutscene(e_legoMovie, TRUE); m_infocenterState->SetUnknown0x74(0); - return; + break; case 4: m_infocenterState->SetUnknown0x74(2); if (m_infocenterState->GetInfocenterBufferElement(0) == NULL) { @@ -362,7 +362,7 @@ void Infocenter::ReadyWorld() PlayAction(c_letsGetStartedDialogue); PlayMusic(JukeBox::e_informationCenter); FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); - return; + break; case 5: default: { PlayMusic(JukeBox::e_informationCenter); @@ -380,13 +380,16 @@ void Infocenter::ReadyWorld() if (m_infocenterState->GetInfocenterBufferElement(0) == NULL) { m_bookAnimationTimer = 1; } + + m_infocenterState->SetUnknown0x74(11); + FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); break; } case 8: PlayMusic(JukeBox::e_informationCenter); PlayAction(c_exitConfirmationDialogue); FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); - return; + break; case 0xf: m_infocenterState->SetUnknown0x74(2); if (m_infocenterState->GetInfocenterBufferElement(0) == NULL) { @@ -396,9 +399,9 @@ void Infocenter::ReadyWorld() PlayAction(c_clickOnInfomanDialogue); PlayMusic(JukeBox::e_informationCenter); FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); - return; + break; } - break; + return; case 1: { if (m_infocenterState->GetUnknown0x74() == 8) { PlayMusic(JukeBox::e_informationCenter); @@ -438,6 +441,12 @@ void Infocenter::ReadyWorld() FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); return; } + + PlayMusic(JukeBox::e_informationCenter); + InfomainScript script = + (InfomainScript) m_infocenterState->GetUnknown0x20()[GameState()->GetUnknown10()].Next(); + PlayAction(script); + bgRed->Enable(TRUE); break; } case 2: { @@ -449,7 +458,7 @@ void Infocenter::ReadyWorld() return; } - Act3State* state = (Act3State*) GameState()->GetState("LegoAct2State"); + Act3State* state = (Act3State*) GameState()->GetState("Act3State"); GameState()->FUN_1003ceb0(); if (state) { @@ -488,6 +497,12 @@ void Infocenter::ReadyWorld() FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); return; } + + PlayMusic(JukeBox::e_informationCenter); + InfomainScript script = + (InfomainScript) m_infocenterState->GetUnknown0x20()[GameState()->GetUnknown10()].Next(); + PlayAction(script); + bgRed->Enable(TRUE); break; } }