From 1e2b37b9de388815cb02011f3f88f29ace357545 Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Wed, 25 Jun 2025 17:51:31 -0700 Subject: [PATCH] Naming --- ISLE/isleapp.cpp | 4 ++-- LEGO1/lego/legoomni/include/legomain.h | 6 +++--- LEGO1/lego/legoomni/src/main/legomain.cpp | 2 +- LEGO1/lego/legoomni/src/worlds/infocenter.cpp | 20 +++++++++---------- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ISLE/isleapp.cpp b/ISLE/isleapp.cpp index 503e2f91..0c9f465d 100644 --- a/ISLE/isleapp.cpp +++ b/ISLE/isleapp.cpp @@ -1116,9 +1116,9 @@ void IsleApp::DetectGameVersion() assert(success); // File sizes of INFOMAIN.SI in English 1.0 and Japanese 1.0 - Lego()->SetIs10(info.size == 58130432 || info.size == 57737216); + Lego()->SetVersion10(info.size == 58130432 || info.size == 57737216); - if (Lego()->GetIs10()) { + if (Lego()->IsVersion10()) { SDL_Log("Detected game version 1.0"); SDL_SetWindowTitle(reinterpret_cast(m_windowHandle), "Lego Island"); } diff --git a/LEGO1/lego/legoomni/include/legomain.h b/LEGO1/lego/legoomni/include/legomain.h index 75a9e5a7..c27be280 100644 --- a/LEGO1/lego/legoomni/include/legomain.h +++ b/LEGO1/lego/legoomni/include/legomain.h @@ -200,8 +200,8 @@ class LegoOmni : public MxOmni { SDL_PushEvent(&event); } - void SetIs10(MxBool p_is10) { m_is10 = p_is10; } - MxBool GetIs10() { return m_is10; } + void SetVersion10(MxBool p_version10) { m_version10 = p_version10; } + MxBool IsVersion10() { return m_version10; } // SYNTHETIC: LEGO1 0x10058b30 // LegoOmni::`scalar deleting destructor' @@ -224,7 +224,7 @@ class LegoOmni : public MxOmni { MxDSAction m_action; // 0xa0 MxBackgroundAudioManager* m_bkgAudioManager; // 0x134 MxTransitionManager* m_transitionManager; // 0x138 - MxBool m_is10; + MxBool m_version10; public: MxBool m_unk0x13c; // 0x13c diff --git a/LEGO1/lego/legoomni/src/main/legomain.cpp b/LEGO1/lego/legoomni/src/main/legomain.cpp index 2bf1ea29..1695e1c3 100644 --- a/LEGO1/lego/legoomni/src/main/legomain.cpp +++ b/LEGO1/lego/legoomni/src/main/legomain.cpp @@ -76,7 +76,7 @@ void LegoOmni::Init() m_bkgAudioManager = NULL; m_unk0x13c = TRUE; m_transitionManager = NULL; - m_is10 = FALSE; + m_version10 = FALSE; } // FUNCTION: LEGO1 0x10058c30 diff --git a/LEGO1/lego/legoomni/src/worlds/infocenter.cpp b/LEGO1/lego/legoomni/src/worlds/infocenter.cpp index 5e16f02a..abbc0711 100644 --- a/LEGO1/lego/legoomni/src/worlds/infocenter.cpp +++ b/LEGO1/lego/legoomni/src/worlds/infocenter.cpp @@ -341,7 +341,7 @@ MxLong Infocenter::HandleEndAction(MxEndActionNotificationParam& p_param) return result; } - if (action->GetObjectId() == InfomainScript::c_iicx26in_RunAnim - Lego()->GetIs10()) { + if (action->GetObjectId() == InfomainScript::c_iicx26in_RunAnim - Lego()->IsVersion10()) { ControlManager()->FUN_100293c0(InfomainScript::c_BigInfo_Ctl, action->GetAtomId().GetInternal(), 0); m_unk0x1d6 = 0; } @@ -481,7 +481,7 @@ void Infocenter::ReadyWorld() InfomainScript::Script script = m_infocenterState->GetNextReturnDialogue(); PlayAction(script); - if (script == InfomainScript::c_iicx26in_RunAnim - Lego()->GetIs10()) { + if (script == InfomainScript::c_iicx26in_RunAnim - Lego()->IsVersion10()) { m_unk0x1d6 = 1; } @@ -1189,13 +1189,13 @@ MxLong Infocenter::HandleNotification0(MxNotificationParam& p_param) m_currentInfomainScript == InfomainScript::c_Pepper_All_Movie || m_currentInfomainScript == InfomainScript::c_Nick_All_Movie || m_currentInfomainScript == InfomainScript::c_Laura_All_Movie || - m_currentInfomainScript == InfomainScript::c_iic007ra_PlayWav - Lego()->GetIs10() || - m_currentInfomainScript == InfomainScript::c_ijs002ra_PlayWav - Lego()->GetIs10() || - m_currentInfomainScript == InfomainScript::c_irt001ra_PlayWav - Lego()->GetIs10() || - m_currentInfomainScript == InfomainScript::c_ipz006ra_PlayWav - Lego()->GetIs10() || - m_currentInfomainScript == InfomainScript::c_igs004ra_PlayWav - Lego()->GetIs10() || - m_currentInfomainScript == InfomainScript::c_iho003ra_PlayWav - Lego()->GetIs10() || - m_currentInfomainScript == InfomainScript::c_ips005ra_PlayWav - Lego()->GetIs10()) { + m_currentInfomainScript == InfomainScript::c_iic007ra_PlayWav - Lego()->IsVersion10() || + m_currentInfomainScript == InfomainScript::c_ijs002ra_PlayWav - Lego()->IsVersion10() || + m_currentInfomainScript == InfomainScript::c_irt001ra_PlayWav - Lego()->IsVersion10() || + m_currentInfomainScript == InfomainScript::c_ipz006ra_PlayWav - Lego()->IsVersion10() || + m_currentInfomainScript == InfomainScript::c_igs004ra_PlayWav - Lego()->IsVersion10() || + m_currentInfomainScript == InfomainScript::c_iho003ra_PlayWav - Lego()->IsVersion10() || + m_currentInfomainScript == InfomainScript::c_ips005ra_PlayWav - Lego()->IsVersion10()) { StopCurrentAction(); } } @@ -1509,7 +1509,7 @@ void Infocenter::StopCredits() // FUNCTION: BETA10 0x1002ee8c void Infocenter::PlayAction(InfomainScript::Script p_script) { - if (Lego()->GetIs10()) { + if (Lego()->IsVersion10()) { if (p_script == InfomainScript::c_iicx18in_RunAnim) { // Alternative dialogue after signing in (1.0 version) p_script = InfomainScript::c_iic016in_RunAnim;