From 110e7d7a525e3332d6be7b9237aac4a4778c062e Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Sun, 11 Feb 2024 09:52:07 -0500 Subject: [PATCH] Rename function --- LEGO1/lego/legoomni/include/infocenterstate.h | 2 +- LEGO1/lego/legoomni/src/infocenter/infocenter.cpp | 6 +++--- LEGO1/lego/legoomni/src/infocenter/infocenterstate.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/LEGO1/lego/legoomni/include/infocenterstate.h b/LEGO1/lego/legoomni/include/infocenterstate.h index 04fda2e1..f99eec38 100644 --- a/LEGO1/lego/legoomni/include/infocenterstate.h +++ b/LEGO1/lego/legoomni/include/infocenterstate.h @@ -29,7 +29,7 @@ class InfocenterState : public LegoState { // FUNCTION: LEGO1 0x10071830 MxBool VTable0x14() override { return FALSE; } // vtable+0x14 - inline MxS16 GetNameLength() { return _countof(m_letters); } + inline MxS16 GetMaxNameLength() { return _countof(m_letters); } inline MxStillPresenter* GetNameLetter(MxS32 p_index) { return m_letters[p_index]; } inline MxBool DoesNameExist() { return m_letters[0] != NULL; } inline Playlist& GetExitDialogueAct1() { return m_exitDialogueAct1; } diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp index cefc0bef..736c27cf 100644 --- a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp +++ b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp @@ -66,7 +66,7 @@ Infocenter::~Infocenter() m_infocenterState->GetNameLetter(i)->Enable(FALSE); } i++; - } while (i < m_infocenterState->GetNameLength()); + } while (i < m_infocenterState->GetMaxNameLength()); ControlManager()->Unregister(this); @@ -101,7 +101,7 @@ MxResult Infocenter::Create(MxDSAction& p_dsAction) } MxS16 count, i; - for (count = 0; count < m_infocenterState->GetNameLength(); count++) { + for (count = 0; count < m_infocenterState->GetMaxNameLength(); count++) { if (m_infocenterState->GetNameLetter(count) == NULL) { break; } @@ -1375,7 +1375,7 @@ void Infocenter::StartCredits() m_infocenterState->GetNameLetter(i)->Enable(FALSE); } i++; - } while (i < m_infocenterState->GetNameLength()); + } while (i < m_infocenterState->GetMaxNameLength()); VideoManager()->FUN_1007c520(); GetViewManager()->RemoveAll(NULL); diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenterstate.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenterstate.cpp index fbf43ec1..0394d710 100644 --- a/LEGO1/lego/legoomni/src/infocenter/infocenterstate.cpp +++ b/LEGO1/lego/legoomni/src/infocenter/infocenterstate.cpp @@ -120,5 +120,5 @@ InfocenterState::~InfocenterState() delete GetNameLetter(i); } i++; - } while (i < GetNameLength()); + } while (i < GetMaxNameLength()); }