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

Beta matching MxAtom classes (#847)

Browse Source 
* Beta matching MxAtom classes

* Remove unused getter

* Restore operator!= for modern compilers
This commit is contained in:
MS
2024-04-25 11:43:42 -04:00
committed by GitHub
parent 31f5143741
commit 612eec6889
6 changed files with 180 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
LEGO1/omni/src/main/mxomni.cpp
View File

@@ -66,7 +66,7 @@ void MxOmni::Init()
m_eventManager = NULL;
m_timer = NULL;
m_streamer = NULL;
m_atomIdCounterSet = NULL;
m_atomSet = NULL;
m_timerRunning = FALSE;
}
@@ -82,7 +82,7 @@ MxResult MxOmni::Create(MxOmniCreateParam& p_param)
{
MxResult result = FAILURE;
if (!(m_atomIdCounterSet = new MxAtomIdCounterSet())) {
if (!(m_atomSet = new MxAtomSet())) {
goto done;
}
@@ -177,6 +177,7 @@ done:
}
// FUNCTION: LEGO1 0x100afe90
// FUNCTION: BETA10 0x1012fe5b
void MxOmni::Destroy()
{
{
@@ -210,15 +211,15 @@ void MxOmni::Destroy()
delete m_tickleManager;
// There could be a tree/iterator function that does this inline
if (m_atomIdCounterSet) {
while (!m_atomIdCounterSet->empty()) {
if (m_atomSet) {
while (m_atomSet->size() != 0) {
// Pop each node and delete its value
MxAtomIdCounterSet::iterator begin = m_atomIdCounterSet->begin();
MxAtomIdCounter* value = *begin;
m_atomIdCounterSet->erase(begin);
MxAtomSet::iterator begin = m_atomSet->begin();
MxAtom* value = *begin;
m_atomSet->erase(begin);
delete value;
}
delete m_atomIdCounterSet;
delete m_atomSet;
}
Init();
}