diff --git a/LEGO1/lego/legoomni/include/legoworld.h b/LEGO1/lego/legoomni/include/legoworld.h index 3ef5c26d..fdf13a5e 100644 --- a/LEGO1/lego/legoomni/include/legoworld.h +++ b/LEGO1/lego/legoomni/include/legoworld.h @@ -73,13 +73,13 @@ class LegoWorld : public LegoEntity { protected: LegoPathControllerList m_list0x68; // 0x68 - MxPresenterList m_list0x80; // 0x80 + MxPresenterList m_animPresenters; // 0x80 LegoCameraController* m_cameraController; // 0x98 LegoEntityList* m_entityList; // 0x9c MxCoreList* m_coreList; // 0xa0 undefined m_unk0xa4; // 0xa4 MxPresenterSet m_set0xa8; // 0xa8 - MxPresenterList m_list0xb8; // 0xb8 + MxPresenterList m_controlPresenters; // 0xb8 MxPresenterSet m_set0xd0; // 0xd0 list m_list0xe0; // 0xe0 undefined4 m_unk0xec; // 0xec diff --git a/LEGO1/lego/legoomni/src/entity/legoworld.cpp b/LEGO1/lego/legoomni/src/entity/legoworld.cpp index 695df6e4..8e5b1e6c 100644 --- a/LEGO1/lego/legoomni/src/entity/legoworld.cpp +++ b/LEGO1/lego/legoomni/src/entity/legoworld.cpp @@ -74,7 +74,7 @@ MxResult LegoWorld::Create(MxDSAction& p_dsAction) } SetCurrentWorld(this); - ControlManager()->FUN_10028df0(&m_list0xb8); + ControlManager()->FUN_10028df0(&m_controlPresenters); } SetIsWorldActive(TRUE); @@ -167,7 +167,7 @@ void LegoWorld::EndAction(MxCore* p_object) MxCore* LegoWorld::FUN_100213a0(const char* p_class, const char* p_name) { if (!strcmp(p_class, "MxControlPresenter")) { - MxPresenterListCursor cursor(&m_list0xb8); + MxPresenterListCursor cursor(&m_controlPresenters); MxPresenter* presenter; while (cursor.Next(presenter)) { @@ -194,7 +194,7 @@ MxCore* LegoWorld::FUN_100213a0(const char* p_class, const char* p_name) return NULL; } else if (!strcmp(p_class, "LegoAnimPresenter")) { - MxPresenterListCursor cursor(&m_list0x80); + MxPresenterListCursor cursor(&m_animPresenters); MxPresenter* presenter; while (cursor.Next(presenter)) { @@ -230,7 +230,7 @@ MxCore* LegoWorld::FUN_10021790(const MxAtomId& p_atom, MxS32 p_entityId) return entity; } - MxPresenterListCursor presenterCursor0xb8(&m_list0xb8); + MxPresenterListCursor presenterCursor0xb8(&m_controlPresenters); MxPresenter* presenter; while (presenterCursor0xb8.Next(presenter)) { @@ -240,7 +240,7 @@ MxCore* LegoWorld::FUN_10021790(const MxAtomId& p_atom, MxS32 p_entityId) return presenter; } - MxPresenterListCursor presenterCursor0x80(&m_list0x80); + MxPresenterListCursor presenterCursor0x80(&m_animPresenters); while (presenterCursor0x80.Next(presenter)) { MxDSAction* action = presenter->GetAction();