mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-24 00:44:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename m_list0x68 to m_pathControllerList in LegoWorld class (#1459)

Browse Source
This commit is contained in:
Florian Kaiser
2025-05-09 20:49:52 +02:00
committed by GitHub
parent 5fd5a4cec0
commit 674197555c
2 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
LEGO1/lego/legoomni/include/legoworld.h
View File

@@ -125,17 +125,17 @@ public:
// LegoWorld::`scalar deleting destructor' // LegoWorld::`scalar deleting destructor'
protected: protected:
LegoPathControllerList m_list0x68; // 0x68 LegoPathControllerList m_pathControllerList; // 0x68
MxPresenterList m_animPresenters; // 0x80 MxPresenterList m_animPresenters; // 0x80
LegoCameraController* m_cameraController; // 0x98 LegoCameraController* m_cameraController; // 0x98
LegoEntityList* m_entityList; // 0x9c LegoEntityList* m_entityList; // 0x9c
LegoCacheSoundList* m_cacheSoundList; // 0xa0 LegoCacheSoundList* m_cacheSoundList; // 0xa0
MxBool m_destroyed; // 0xa4 MxBool m_destroyed; // 0xa4
MxCoreSet m_set0xa8; // 0xa8 MxCoreSet m_set0xa8; // 0xa8
MxPresenterList m_controlPresenters; // 0xb8 MxPresenterList m_controlPresenters; // 0xb8
MxCoreSet m_set0xd0; // 0xd0 MxCoreSet m_set0xd0; // 0xd0
list<LegoROI*> m_roiList; // 0xe0 list<LegoROI*> m_roiList; // 0xe0
LegoOmni::World m_worldId; // 0xec LegoOmni::World m_worldId; // 0xec
// name verified by BETA10 0x100c7f59 // name verified by BETA10 0x100c7f59
LegoHideAnimPresenter* m_hideAnim; // 0xf0 LegoHideAnimPresenter* m_hideAnim; // 0xf0

26
LEGO1/lego/legoomni/src/entity/legoworld.cpp
View File

@@ -32,7 +32,7 @@ DECOMP_SIZE_ASSERT(LegoCacheSoundList, 0x18)
DECOMP_SIZE_ASSERT(LegoCacheSoundListCursor, 0x10) DECOMP_SIZE_ASSERT(LegoCacheSoundListCursor, 0x10)
// FUNCTION: LEGO1 0x1001ca40 // FUNCTION: LEGO1 0x1001ca40
LegoWorld::LegoWorld() : m_list0x68(TRUE) LegoWorld::LegoWorld() : m_pathControllerList(TRUE)
{ {
m_startupTicks = e_four; m_startupTicks = e_four;
m_cameraController = NULL; m_cameraController = NULL;
@@ -100,7 +100,7 @@ void LegoWorld::Destroy(MxBool p_fromDestructor)
SetCurrentWorld(NULL); SetCurrentWorld(NULL);
} }
m_list0x68.DeleteAll(); m_pathControllerList.DeleteAll();
if (m_cameraController) { if (m_cameraController) {
delete m_cameraController; delete m_cameraController;
@@ -273,7 +273,7 @@ MxResult LegoWorld::PlaceActor(
float p_destScale float p_destScale
) )
{ {
LegoPathControllerListCursor cursor(&m_list0x68); LegoPathControllerListCursor cursor(&m_pathControllerList);
LegoPathController* controller; LegoPathController* controller;
while (cursor.Next(controller)) { while (cursor.Next(controller)) {
@@ -288,7 +288,7 @@ MxResult LegoWorld::PlaceActor(
// FUNCTION: LEGO1 0x1001fa70 // FUNCTION: LEGO1 0x1001fa70
MxResult LegoWorld::PlaceActor(LegoPathActor* p_actor) MxResult LegoWorld::PlaceActor(LegoPathActor* p_actor)
{ {
LegoPathControllerListCursor cursor(&m_list0x68); LegoPathControllerListCursor cursor(&m_pathControllerList);
LegoPathController* controller; LegoPathController* controller;
while (cursor.Next(controller)) { while (cursor.Next(controller)) {
@@ -308,7 +308,7 @@ MxResult LegoWorld::PlaceActor(
Vector3& p_direction Vector3& p_direction
) )
{ {
LegoPathControllerListCursor cursor(&m_list0x68); LegoPathControllerListCursor cursor(&m_pathControllerList);
LegoPathController* controller; LegoPathController* controller;
while (cursor.Next(controller)) { while (cursor.Next(controller)) {
@@ -324,7 +324,7 @@ MxResult LegoWorld::PlaceActor(
// FUNCTION: BETA10 0x100da4bf // FUNCTION: BETA10 0x100da4bf
void LegoWorld::RemoveActor(LegoPathActor* p_actor) void LegoWorld::RemoveActor(LegoPathActor* p_actor)
{ {
LegoPathControllerListCursor cursor(&m_list0x68); LegoPathControllerListCursor cursor(&m_pathControllerList);
LegoPathController* controller; LegoPathController* controller;
while (cursor.Next(controller)) { while (cursor.Next(controller)) {
@@ -337,7 +337,7 @@ void LegoWorld::RemoveActor(LegoPathActor* p_actor)
// FUNCTION: BETA10 0x100da560 // FUNCTION: BETA10 0x100da560
MxBool LegoWorld::ActorExists(LegoPathActor* p_actor) MxBool LegoWorld::ActorExists(LegoPathActor* p_actor)
{ {
LegoPathControllerListCursor cursor(&m_list0x68); LegoPathControllerListCursor cursor(&m_pathControllerList);
LegoPathController* controller; LegoPathController* controller;
while (cursor.Next(controller)) { while (cursor.Next(controller)) {
@@ -353,7 +353,7 @@ MxBool LegoWorld::ActorExists(LegoPathActor* p_actor)
// FUNCTION: BETA10 0x100da621 // FUNCTION: BETA10 0x100da621
void LegoWorld::FUN_1001fda0(LegoAnimPresenter* p_presenter) void LegoWorld::FUN_1001fda0(LegoAnimPresenter* p_presenter)
{ {
LegoPathControllerListCursor cursor(&m_list0x68); LegoPathControllerListCursor cursor(&m_pathControllerList);
LegoPathController* controller; LegoPathController* controller;
while (cursor.Next(controller)) { while (cursor.Next(controller)) {
@@ -365,7 +365,7 @@ void LegoWorld::FUN_1001fda0(LegoAnimPresenter* p_presenter)
// FUNCTION: BETA10 0x100da6b5 // FUNCTION: BETA10 0x100da6b5
void LegoWorld::FUN_1001fe90(LegoAnimPresenter* p_presenter) void LegoWorld::FUN_1001fe90(LegoAnimPresenter* p_presenter)
{ {
LegoPathControllerListCursor cursor(&m_list0x68); LegoPathControllerListCursor cursor(&m_pathControllerList);
LegoPathController* controller; LegoPathController* controller;
while (cursor.Next(controller)) { while (cursor.Next(controller)) {
@@ -377,14 +377,14 @@ void LegoWorld::FUN_1001fe90(LegoAnimPresenter* p_presenter)
void LegoWorld::AddPath(LegoPathController* p_controller) void LegoWorld::AddPath(LegoPathController* p_controller)
{ {
p_controller->FUN_10046bb0(this); p_controller->FUN_10046bb0(this);
m_list0x68.Append(p_controller); m_pathControllerList.Append(p_controller);
} }
// FUNCTION: LEGO1 0x10020020 // FUNCTION: LEGO1 0x10020020
// FUNCTION: BETA10 0x100da77c // FUNCTION: BETA10 0x100da77c
LegoPathBoundary* LegoWorld::FindPathBoundary(const char* p_name) LegoPathBoundary* LegoWorld::FindPathBoundary(const char* p_name)
{ {
LegoPathControllerListCursor cursor(&m_list0x68); LegoPathControllerListCursor cursor(&m_pathControllerList);
LegoPathController* controller; LegoPathController* controller;
while (cursor.Next(controller)) { while (cursor.Next(controller)) {
@@ -401,7 +401,7 @@ LegoPathBoundary* LegoWorld::FindPathBoundary(const char* p_name)
// FUNCTION: LEGO1 0x10020120 // FUNCTION: LEGO1 0x10020120
MxResult LegoWorld::GetCurrPathInfo(LegoPathBoundary** p_boundaries, MxS32& p_numL) MxResult LegoWorld::GetCurrPathInfo(LegoPathBoundary** p_boundaries, MxS32& p_numL)
{ {
LegoPathControllerListCursor cursor(&m_list0x68); LegoPathControllerListCursor cursor(&m_pathControllerList);
LegoPathController* controller; LegoPathController* controller;
cursor.Next(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)) { while (pathControllerCursor.Next(controller)) {
controller->Enable(FALSE); controller->Enable(FALSE);