From 843271f1a647f17f2368c7bc8ede5f9a52269d88 Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Sun, 11 Feb 2024 10:01:09 -0500 Subject: [PATCH] Rename function --- LEGO1/lego/legoomni/include/infocenterstate.h | 2 +- .../lego/legoomni/src/common/legogamestate.cpp | 2 +- .../legoomni/src/infocenter/infocenter.cpp | 18 +++++++++--------- .../legoomni/src/infocenter/infocenterdoor.cpp | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/LEGO1/lego/legoomni/include/infocenterstate.h b/LEGO1/lego/legoomni/include/infocenterstate.h index ebca4a71..d47f220e 100644 --- a/LEGO1/lego/legoomni/include/infocenterstate.h +++ b/LEGO1/lego/legoomni/include/infocenterstate.h @@ -31,7 +31,7 @@ class InfocenterState : public LegoState { inline MxS16 GetMaxNameLength() { return _countof(m_letters); } inline MxStillPresenter* GetNameLetter(MxS32 p_index) { return m_letters[p_index]; } - inline MxBool IsProfileSelected() { return m_letters[0] != NULL; } + inline MxBool HasRegistered() { return m_letters[0] != NULL; } inline Playlist& GetExitDialogueAct1() { return m_exitDialogueAct1; } inline Playlist& GetExitDialogueAct23() { return m_exitDialogueAct23; } inline Playlist& GetReturnDialogue(LegoGameState::Act p_act) { return m_returnDialogue[p_act]; } diff --git a/LEGO1/lego/legoomni/src/common/legogamestate.cpp b/LEGO1/lego/legoomni/src/common/legogamestate.cpp index 95158ec6..ce379f47 100644 --- a/LEGO1/lego/legoomni/src/common/legogamestate.cpp +++ b/LEGO1/lego/legoomni/src/common/legogamestate.cpp @@ -126,7 +126,7 @@ MxResult LegoGameState::Save(MxULong p_slot) MxResult result; InfocenterState* infocenterState = (InfocenterState*) GameState()->GetState("InfocenterState"); - if (!infocenterState || !infocenterState->IsProfileSelected()) { + if (!infocenterState || !infocenterState->HasRegistered()) { result = SUCCESS; } else { diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp index 1e933a61..3e4e3c40 100644 --- a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp +++ b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp @@ -267,7 +267,7 @@ MxLong Infocenter::HandleEndAction(MxEndActionNotificationParam& p_param) PlayAction(c_welcomeDialogue); m_currentCutscene = e_noIntro; - if (!m_infocenterState->IsProfileSelected()) { + if (!m_infocenterState->HasRegistered()) { m_bookAnimationTimer = 1; return 1; } @@ -311,7 +311,7 @@ MxLong Infocenter::HandleEndAction(MxEndActionNotificationParam& p_param) } break; case 11: - if (!m_infocenterState->IsProfileSelected() && m_currentInfomainScript != c_mamaMovie && + if (!m_infocenterState->HasRegistered() && m_currentInfomainScript != c_mamaMovie && m_currentInfomainScript != c_papaMovie && m_currentInfomainScript != c_pepperMovie && m_currentInfomainScript != c_nickMovie && m_currentInfomainScript != c_lauraMovie) { m_infoManDialogueTimer = 1; @@ -355,7 +355,7 @@ void Infocenter::ReadyWorld() break; case 4: m_infocenterState->SetUnknown0x74(2); - if (!m_infocenterState->IsProfileSelected()) { + if (!m_infocenterState->HasRegistered()) { m_bookAnimationTimer = 1; } @@ -377,7 +377,7 @@ void Infocenter::ReadyWorld() FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); - if (!m_infocenterState->IsProfileSelected()) { + if (!m_infocenterState->HasRegistered()) { m_bookAnimationTimer = 1; } @@ -392,7 +392,7 @@ void Infocenter::ReadyWorld() break; case 0xf: m_infocenterState->SetUnknown0x74(2); - if (!m_infocenterState->IsProfileSelected()) { + if (!m_infocenterState->HasRegistered()) { m_bookAnimationTimer = 1; } @@ -622,7 +622,7 @@ MxLong Infocenter::HandleKeyPress(MxS8 p_key) StopCutscene(); m_infocenterState->SetUnknown0x74(1); - if (!m_infocenterState->IsProfileSelected()) { + if (!m_infocenterState->HasRegistered()) { m_bookAnimationTimer = 1; return 1; } @@ -801,7 +801,7 @@ MxU8 Infocenter::HandleButtonUp(MxS32 p_x, MxS32 p_y) InfomainScript dialogueToPlay; if (GameState()->GetCurrentAct() == LegoGameState::e_act1) { - if (!m_infocenterState->IsProfileSelected()) { + if (!m_infocenterState->HasRegistered()) { m_infocenterState->SetUnknown0x74(2); m_transitionDestination = LegoGameState::e_noArea; dialogueToPlay = c_registerToContinueDialogue; @@ -949,7 +949,7 @@ MxU8 Infocenter::HandleClick(LegoControlManagerEvent& p_param) break; case LegoGameState::e_unk4: if (state->GetUnknownC()) { - if (m_infocenterState->IsProfileSelected()) { + if (m_infocenterState->HasRegistered()) { m_infocenterState->SetUnknown0x74(5); m_transitionDestination = state->GetPreviousArea(); actionToPlay = @@ -1069,7 +1069,7 @@ MxLong Infocenter::HandleNotification0(MxNotificationParam& p_param) } case 7: if (m_infocenterState->GetUnknown0x74() == 8) { - if (m_infocenterState->IsProfileSelected()) { + if (m_infocenterState->HasRegistered()) { GameState()->Save(0); } diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp index 033717d5..74d1cfdc 100644 --- a/LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp +++ b/LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp @@ -111,7 +111,7 @@ MxLong InfocenterDoor::HandleClick(LegoControlManagerEvent& p_param) case 4: if (GameState()->GetUnknownC()) { InfocenterState* state = (InfocenterState*) GameState()->GetState("InfocenterState"); - if (state->IsProfileSelected()) { + if (state->HasRegistered()) { m_unk0xf8 = LegoGameState::e_unk4; } else {