This commit is contained in:
jonschz 2025-02-21 19:42:23 +01:00
parent e04ae2b56e
commit 881ac1c83b

View File

@ -456,7 +456,7 @@ void Infocenter::ReadyWorld()
case 3: case 3:
PlayCutscene(e_legoMovie, TRUE); PlayCutscene(e_legoMovie, TRUE);
m_infocenterState->m_unk0x74 = 0; m_infocenterState->m_unk0x74 = 0;
break; return;
case 4: case 4:
m_infocenterState->m_unk0x74 = 2; m_infocenterState->m_unk0x74 = 2;
if (!m_infocenterState->HasRegistered()) { if (!m_infocenterState->HasRegistered()) {
@ -466,7 +466,7 @@ void Infocenter::ReadyWorld()
PlayAction(InfomainScript::c_iicx18in_RunAnim); PlayAction(InfomainScript::c_iicx18in_RunAnim);
PlayMusic(JukeboxScript::c_InformationCenter_Music); 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; return;
case 5: case 5:
default: { default: {
PlayMusic(JukeboxScript::c_InformationCenter_Music); PlayMusic(JukeboxScript::c_InformationCenter_Music);
@ -484,15 +484,15 @@ void Infocenter::ReadyWorld()
m_bookAnimationTimer = 1; m_bookAnimationTimer = 1;
} }
m_infocenterState->m_unk0x74 = 11; // m_infocenterState->m_unk0x74 = 11;
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 8: case 8:
PlayMusic(JukeboxScript::c_InformationCenter_Music); 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; return;
case 0xf: case 0xf:
m_infocenterState->m_unk0x74 = 2; m_infocenterState->m_unk0x74 = 2;
if (!m_infocenterState->HasRegistered()) { if (!m_infocenterState->HasRegistered()) {
@ -502,9 +502,9 @@ void Infocenter::ReadyWorld()
PlayAction(InfomainScript::c_iicx17in_RunAnim); PlayAction(InfomainScript::c_iicx17in_RunAnim);
PlayMusic(JukeboxScript::c_InformationCenter_Music); 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;
}
return; return;
}
break;
case LegoGameState::e_act2: { case LegoGameState::e_act2: {
if (m_infocenterState->m_unk0x74 == 8) { if (m_infocenterState->m_unk0x74 == 8) {
PlayMusic(JukeboxScript::c_InformationCenter_Music); PlayMusic(JukeboxScript::c_InformationCenter_Music);
@ -562,8 +562,7 @@ void Infocenter::ReadyWorld()
Act3State* state = (Act3State*) GameState()->GetState("Act3State"); Act3State* state = (Act3State*) GameState()->GetState("Act3State");
GameState()->FindLoadedAct(); GameState()->FindLoadedAct();
if (state) { if (state && state->GetUnknown0x08() == 3) {
if (state->GetUnknown0x08() == 3) {
bg->Enable(TRUE); bg->Enable(TRUE);
PlayCutscene(e_badEndMovie, TRUE); PlayCutscene(e_badEndMovie, TRUE);
m_infocenterState->m_unk0x74 = 0; m_infocenterState->m_unk0x74 = 0;
@ -576,7 +575,6 @@ void Infocenter::ReadyWorld()
m_infocenterState->m_unk0x74 = 0; m_infocenterState->m_unk0x74 = 0;
return; return;
} }
}
if (m_infocenterState->m_unk0x74 == 4) { if (m_infocenterState->m_unk0x74 == 4) {
bgRed->Enable(TRUE); bgRed->Enable(TRUE);