From 674197555c22e28fd1ce2af3e3b30b28f7207dc7 Mon Sep 17 00:00:00 2001 From: Florian Kaiser Date: Fri, 9 May 2025 20:49:52 +0200 Subject: [PATCH] Rename `m_list0x68` to `m_pathControllerList` in `LegoWorld` class (#1459) --- LEGO1/lego/legoomni/include/legoworld.h | 22 ++++++++--------- LEGO1/lego/legoomni/src/entity/legoworld.cpp | 26 ++++++++++---------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/LEGO1/lego/legoomni/include/legoworld.h b/LEGO1/lego/legoomni/include/legoworld.h index 10ff56ab..11e5e667 100644 --- a/LEGO1/lego/legoomni/include/legoworld.h +++ b/LEGO1/lego/legoomni/include/legoworld.h @@ -125,17 +125,17 @@ public: // LegoWorld::`scalar deleting destructor' protected: - LegoPathControllerList m_list0x68; // 0x68 - MxPresenterList m_animPresenters; // 0x80 - LegoCameraController* m_cameraController; // 0x98 - LegoEntityList* m_entityList; // 0x9c - LegoCacheSoundList* m_cacheSoundList; // 0xa0 - MxBool m_destroyed; // 0xa4 - MxCoreSet m_set0xa8; // 0xa8 - MxPresenterList m_controlPresenters; // 0xb8 - MxCoreSet m_set0xd0; // 0xd0 - list m_roiList; // 0xe0 - LegoOmni::World m_worldId; // 0xec + LegoPathControllerList m_pathControllerList; // 0x68 + MxPresenterList m_animPresenters; // 0x80 + LegoCameraController* m_cameraController; // 0x98 + LegoEntityList* m_entityList; // 0x9c + LegoCacheSoundList* m_cacheSoundList; // 0xa0 + MxBool m_destroyed; // 0xa4 + MxCoreSet m_set0xa8; // 0xa8 + MxPresenterList m_controlPresenters; // 0xb8 + MxCoreSet m_set0xd0; // 0xd0 + list m_roiList; // 0xe0 + LegoOmni::World m_worldId; // 0xec // name verified by BETA10 0x100c7f59 LegoHideAnimPresenter* m_hideAnim; // 0xf0 diff --git a/LEGO1/lego/legoomni/src/entity/legoworld.cpp b/LEGO1/lego/legoomni/src/entity/legoworld.cpp index 7ced4e38..c6ae2d92 100644 --- a/LEGO1/lego/legoomni/src/entity/legoworld.cpp +++ b/LEGO1/lego/legoomni/src/entity/legoworld.cpp @@ -32,7 +32,7 @@ DECOMP_SIZE_ASSERT(LegoCacheSoundList, 0x18) DECOMP_SIZE_ASSERT(LegoCacheSoundListCursor, 0x10) // FUNCTION: LEGO1 0x1001ca40 -LegoWorld::LegoWorld() : m_list0x68(TRUE) +LegoWorld::LegoWorld() : m_pathControllerList(TRUE) { m_startupTicks = e_four; m_cameraController = NULL; @@ -100,7 +100,7 @@ void LegoWorld::Destroy(MxBool p_fromDestructor) SetCurrentWorld(NULL); } - m_list0x68.DeleteAll(); + m_pathControllerList.DeleteAll(); if (m_cameraController) { delete m_cameraController; @@ -273,7 +273,7 @@ MxResult LegoWorld::PlaceActor( float p_destScale ) { - LegoPathControllerListCursor cursor(&m_list0x68); + LegoPathControllerListCursor cursor(&m_pathControllerList); LegoPathController* controller; while (cursor.Next(controller)) { @@ -288,7 +288,7 @@ MxResult LegoWorld::PlaceActor( // FUNCTION: LEGO1 0x1001fa70 MxResult LegoWorld::PlaceActor(LegoPathActor* p_actor) { - LegoPathControllerListCursor cursor(&m_list0x68); + LegoPathControllerListCursor cursor(&m_pathControllerList); LegoPathController* controller; while (cursor.Next(controller)) { @@ -308,7 +308,7 @@ MxResult LegoWorld::PlaceActor( Vector3& p_direction ) { - LegoPathControllerListCursor cursor(&m_list0x68); + LegoPathControllerListCursor cursor(&m_pathControllerList); LegoPathController* controller; while (cursor.Next(controller)) { @@ -324,7 +324,7 @@ MxResult LegoWorld::PlaceActor( // FUNCTION: BETA10 0x100da4bf void LegoWorld::RemoveActor(LegoPathActor* p_actor) { - LegoPathControllerListCursor cursor(&m_list0x68); + LegoPathControllerListCursor cursor(&m_pathControllerList); LegoPathController* controller; while (cursor.Next(controller)) { @@ -337,7 +337,7 @@ void LegoWorld::RemoveActor(LegoPathActor* p_actor) // FUNCTION: BETA10 0x100da560 MxBool LegoWorld::ActorExists(LegoPathActor* p_actor) { - LegoPathControllerListCursor cursor(&m_list0x68); + LegoPathControllerListCursor cursor(&m_pathControllerList); LegoPathController* controller; while (cursor.Next(controller)) { @@ -353,7 +353,7 @@ MxBool LegoWorld::ActorExists(LegoPathActor* p_actor) // FUNCTION: BETA10 0x100da621 void LegoWorld::FUN_1001fda0(LegoAnimPresenter* p_presenter) { - LegoPathControllerListCursor cursor(&m_list0x68); + LegoPathControllerListCursor cursor(&m_pathControllerList); LegoPathController* controller; while (cursor.Next(controller)) { @@ -365,7 +365,7 @@ void LegoWorld::FUN_1001fda0(LegoAnimPresenter* p_presenter) // FUNCTION: BETA10 0x100da6b5 void LegoWorld::FUN_1001fe90(LegoAnimPresenter* p_presenter) { - LegoPathControllerListCursor cursor(&m_list0x68); + LegoPathControllerListCursor cursor(&m_pathControllerList); LegoPathController* controller; while (cursor.Next(controller)) { @@ -377,14 +377,14 @@ void LegoWorld::FUN_1001fe90(LegoAnimPresenter* p_presenter) void LegoWorld::AddPath(LegoPathController* p_controller) { p_controller->FUN_10046bb0(this); - m_list0x68.Append(p_controller); + m_pathControllerList.Append(p_controller); } // FUNCTION: LEGO1 0x10020020 // FUNCTION: BETA10 0x100da77c LegoPathBoundary* LegoWorld::FindPathBoundary(const char* p_name) { - LegoPathControllerListCursor cursor(&m_list0x68); + LegoPathControllerListCursor cursor(&m_pathControllerList); LegoPathController* controller; while (cursor.Next(controller)) { @@ -401,7 +401,7 @@ LegoPathBoundary* LegoWorld::FindPathBoundary(const char* p_name) // FUNCTION: LEGO1 0x10020120 MxResult LegoWorld::GetCurrPathInfo(LegoPathBoundary** p_boundaries, MxS32& p_numL) { - LegoPathControllerListCursor cursor(&m_list0x68); + LegoPathControllerListCursor cursor(&m_pathControllerList); LegoPathController* controller; cursor.Next(controller); @@ -795,7 +795,7 @@ void LegoWorld::Enable(MxBool p_enable) } } - LegoPathControllerListCursor pathControllerCursor(&m_list0x68); + LegoPathControllerListCursor pathControllerCursor(&m_pathControllerList); while (pathControllerCursor.Next(controller)) { controller->Enable(FALSE);