From 9f4089a3ed5e211d622aae6ad2482df4ebc39842 Mon Sep 17 00:00:00 2001 From: Misha <106913236+MishaProductions@users.noreply.github.com> Date: Tue, 30 Jan 2024 19:13:46 -0500 Subject: [PATCH] fix order --- .../lego/legoomni/src/infocenter/infocenter.cpp | 12 ++++++------ .../legoomni/src/infocenter/infocenterdoor.cpp | 16 ++++++++-------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp index 8869772a..a35f4aff 100644 --- a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp +++ b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp @@ -720,6 +720,12 @@ void Infocenter::StopCutscene() FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); } +// FUNCTION: LEGO1 0x10070d00 +MxBool Infocenter::VTable0x5c() +{ + return TRUE; +} + // FUNCTION: LEGO1 0x10070d10 void Infocenter::FUN_10070d10(MxS32 p_x, MxS32 p_y) { @@ -747,12 +753,6 @@ void Infocenter::FUN_10070d10(MxS32 p_x, MxS32 p_y) } } -// FUNCTION: LEGO1 0x10070d00 -MxBool Infocenter::VTable0x5c() -{ - return TRUE; -} - // FUNCTION: LEGO1 0x10070dc0 void Infocenter::UpdateFrameHot(MxBool p_display) { diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp index 95bbbdce..76ace23c 100644 --- a/LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp +++ b/LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp @@ -76,6 +76,14 @@ MxLong InfocenterDoor::Notify(MxParam& p_param) return result; } +// FUNCTION: LEGO1 0x10037a70 +void InfocenterDoor::ReadyWorld() +{ + LegoWorld::ReadyWorld(); + PlayMusic(JukeBox::e_informationCenter); + FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); +} + // FUNCTION: LEGO1 0x10037a90 MxLong InfocenterDoor::HandleClick(LegoControlManagerEvent& p_param) { @@ -124,14 +132,6 @@ MxLong InfocenterDoor::HandleClick(LegoControlManagerEvent& p_param) return 1; } -// FUNCTION: LEGO1 0x10037a70 -void InfocenterDoor::ReadyWorld() -{ - LegoWorld::ReadyWorld(); - PlayMusic(JukeBox::e_informationCenter); - FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); -} - // FUNCTION: LEGO1 0x10037c80 void InfocenterDoor::VTable0x68(MxBool p_add) {