From 2fe3c35305c7a2ec13ff76f255fb716b27aee67c Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Fri, 26 Jan 2024 17:17:22 -0500 Subject: [PATCH] Change MxPresenterSet to MxCoreSet --- LEGO1/lego/legoomni/include/legoworld.h | 42 ++++++++++---------- LEGO1/lego/legoomni/src/common/legoutil.cpp | 2 +- LEGO1/lego/legoomni/src/entity/legoworld.cpp | 8 ++-- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/LEGO1/lego/legoomni/include/legoworld.h b/LEGO1/lego/legoomni/include/legoworld.h index 5baa792b..05dbc095 100644 --- a/LEGO1/lego/legoomni/include/legoworld.h +++ b/LEGO1/lego/legoomni/include/legoworld.h @@ -14,11 +14,11 @@ class IslePathActor; class LegoPathBoundary; class LegoHideAnimPresenter; -struct PresenterSetCompare { - MxS32 operator()(MxPresenter* const& p_a, MxPresenter* const& p_b) const { return p_a > p_b; } +struct CoreSetCompare { + MxS32 operator()(MxCore* const& p_a, MxCore* const& p_b) const { return p_a > p_b; } }; -typedef set MxPresenterSet; +typedef set MxCoreSet; // VTABLE: LEGO1 0x100d6280 // SIZE 0xf8 @@ -80,9 +80,9 @@ class LegoWorld : public LegoEntity { LegoEntityList* m_entityList; // 0x9c LegoCacheSoundList* m_cacheSoundList; // 0xa0 undefined m_unk0xa4; // 0xa4 - MxPresenterSet m_set0xa8; // 0xa8 + MxCoreSet m_set0xa8; // 0xa8 MxPresenterList m_controlPresenters; // 0xb8 - MxPresenterSet m_set0xd0; // 0xd0 + MxCoreSet m_set0xd0; // 0xd0 list m_list0xe0; // 0xe0 undefined4 m_unk0xec; // 0xec LegoHideAnimPresenter* m_hideAnimPresenter; // 0xf0 @@ -93,19 +93,19 @@ class LegoWorld : public LegoEntity { // clang-format off // TEMPLATE: LEGO1 0x1001d780 -// _Tree >::_Kfn,PresenterSetCompare,allocator >::~_Tree >::_Kfn,PresenterSetCompare,allocator > +// _Tree >::_Kfn,CoreSetCompare,allocator >::~_Tree >::_Kfn,CoreSetCompare,allocator > // TEMPLATE: LEGO1 0x1001d850 -// _Tree >::_Kfn,PresenterSetCompare,allocator >::iterator::_Inc +// _Tree >::_Kfn,CoreSetCompare,allocator >::iterator::_Inc // TEMPLATE: LEGO1 0x1001d890 -// _Tree >::_Kfn,PresenterSetCompare,allocator >::erase +// _Tree >::_Kfn,CoreSetCompare,allocator >::erase // TEMPLATE: LEGO1 0x1001dcf0 -// _Tree >::_Kfn,PresenterSetCompare,allocator >::_Erase +// _Tree >::_Kfn,CoreSetCompare,allocator >::_Erase // TEMPLATE: LEGO1 0x1001dd30 -// _Tree >::_Kfn,PresenterSetCompare,allocator >::_Init +// _Tree >::_Kfn,CoreSetCompare,allocator >::_Init // TEMPLATE: LEGO1 0x1001ddf0 // list >::~list > @@ -117,10 +117,10 @@ class LegoWorld : public LegoEntity { // list >::_Buynode // TEMPLATE: LEGO1 0x1001de90 -// set >::~set > +// set >::~set > // TEMPLATE: LEGO1 0x1001df00 -// Set::~Set +// Set::~Set // SYNTHETIC: LEGO1 0x1001eed0 // MxPresenterListCursor::`scalar deleting destructor' @@ -129,7 +129,7 @@ class LegoWorld : public LegoEntity { // MxPtrListCursor::~MxPtrListCursor // SYNTHETIC: LEGO1 0x1001ef90 -// MxListCursor::`scalar deleting destructor' +// MxListCursor::`scalar deleting destructor' // SYNTHETIC: LEGO1 0x1001f000 // MxPtrListCursor::`scalar deleting destructor' @@ -144,30 +144,30 @@ class LegoWorld : public LegoEntity { // MxListCursor::MxListCursor // TEMPLATE: LEGO1 0x100208b0 -// _Tree >::_Kfn,PresenterSetCompare,allocator >::insert +// _Tree >::_Kfn,CoreSetCompare,allocator >::insert // TEMPLATE: LEGO1 0x10020b20 -// _Tree >::_Kfn,PresenterSetCompare,allocator >::iterator::_Dec +// _Tree >::_Kfn,CoreSetCompare,allocator >::iterator::_Dec -// XTEMPLATE: LEGO1 0x10020b70 +// XTEMPLATE LEGO1 0x10020b70 // TEMPLATE: LEGO1 0x10020bb0 -// _Tree >::_Kfn,PresenterSetCompare,allocator >::_Buynode +// _Tree >::_Kfn,CoreSetCompare,allocator >::_Buynode // TEMPLATE: LEGO1 0x10020bd0 -// _Tree >::_Kfn,PresenterSetCompare,allocator >::_Insert +// _Tree >::_Kfn,CoreSetCompare,allocator >::_Insert // TEMPLATE: LEGO1 0x10020e50 -// _Tree >::_Kfn,PresenterSetCompare,allocator >::_Lrotate +// _Tree >::_Kfn,CoreSetCompare,allocator >::_Lrotate // TEMPLATE: LEGO1 0x10020eb0 -// _Tree >::_Kfn,PresenterSetCompare,allocator >::_Rrotate +// _Tree >::_Kfn,CoreSetCompare,allocator >::_Rrotate // TEMPLATE: LEGO1 0x10022360 // _Construct // GLOBAL: LEGO1 0x100f11a0 -// _Tree >::_Kfn,PresenterSetCompare,allocator >::_Nil +// _Tree >::_Kfn,CoreSetCompare,allocator >::_Nil // clang-format on #endif // LEGOWORLD_H diff --git a/LEGO1/lego/legoomni/src/common/legoutil.cpp b/LEGO1/lego/legoomni/src/common/legoutil.cpp index 10aad75f..dfb4b740 100644 --- a/LEGO1/lego/legoomni/src/common/legoutil.cpp +++ b/LEGO1/lego/legoomni/src/common/legoutil.cpp @@ -13,7 +13,7 @@ // STUB: LEGO1 0x1003e050 void FUN_1003e050(LegoAnimPresenter* p_presenter) { - // TOOD + // TODO } // FUNCTION: LEGO1 0x1003e300 diff --git a/LEGO1/lego/legoomni/src/entity/legoworld.cpp b/LEGO1/lego/legoomni/src/entity/legoworld.cpp index 24907122..84982a97 100644 --- a/LEGO1/lego/legoomni/src/entity/legoworld.cpp +++ b/LEGO1/lego/legoomni/src/entity/legoworld.cpp @@ -205,8 +205,8 @@ void LegoWorld::Add(MxCore* p_object) m_cacheSoundList->Append(sound); } else { - if (m_set0xa8.find((MxPresenter*) p_object) == m_set0xa8.end()) - m_set0xa8.insert((MxPresenter*) p_object); + if (m_set0xa8.find(p_object) == m_set0xa8.end()) + m_set0xa8.insert(p_object); } if (!m_set0xd0.empty() && p_object->IsA("MxPresenter")) { @@ -268,7 +268,7 @@ MxCore* LegoWorld::Find(const char* p_class, const char* p_name) return NULL; } else { - for (MxPresenterSet::iterator it = m_set0xa8.begin(); it != m_set0xa8.end(); it++) { + for (MxCoreSet::iterator it = m_set0xa8.begin(); it != m_set0xa8.end(); it++) { if ((*it)->IsA(p_class) && (*it)->IsA("MxPresenter")) { MxPresenter* presenter = (MxPresenter*) *it; MxDSAction* action = presenter->GetAction(); @@ -312,7 +312,7 @@ MxCore* LegoWorld::Find(const MxAtomId& p_atom, MxS32 p_entityId) return presenter; } - for (MxPresenterSet::iterator it = m_set0xa8.begin(); it != m_set0xa8.end(); it++) { + for (MxCoreSet::iterator it = m_set0xa8.begin(); it != m_set0xa8.end(); it++) { MxCore* core = *it; if (core->IsA("MxPresenter")) {