isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-20 23:01:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Match RemovePresenter/Detach

Browse Source
This commit is contained in:
Christian Semmler 2023-09-15 07:01:42 -04:00
parent eadacf4e04
commit 771ab307e4
1 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
LEGO1/mxlist.h
View File

@ -60,9 +60,13 @@ class MxList : protected MxListParent<T>
void Append(T*); void Append(T*);
friend class MxListCursor<T>; friend class MxListCursor<T>;
protected: protected:
MxListEntry<T> *m_first; // +0x10 MxListEntry<T> *m_first; // +0x10
MxListEntry<T> *m_last; // +0x14 MxListEntry<T> *m_last; // +0x14
private:
void _DeleteEntry(MxListEntry<T> *match);
}; };
// VTABLE 0x100d6488 // VTABLE 0x100d6488
@ -135,6 +139,26 @@ inline void MxList<T>::Append(T *p_newobj)
this->m_count++; this->m_count++;
} }
template <class T>
inline void MxList<T>::_DeleteEntry(MxListEntry<T> *match)
{
MxListEntry<T> **pPrev = &match->m_prev;
MxListEntry<T> **pNext = &match->m_next;
if (match->m_prev)
match->m_prev->m_next = *pNext;
else
m_first = *pNext;
if (*pNext)
(*pNext)->m_prev = *pPrev;
else
m_last = *pPrev;
delete match;
m_count--;
}
template <class T> template <class T>
inline MxBool MxListCursor<T>::Find(T *p_obj) inline MxBool MxListCursor<T>::Find(T *p_obj)
{ {
@ -148,21 +172,7 @@ inline MxBool MxListCursor<T>::Find(T *p_obj)
template <class T> template <class T>
inline void MxListCursor<T>::Detach() inline void MxListCursor<T>::Detach()
{ {
MxListEntry<T> *m_prev = m_match->m_prev; m_list->_DeleteEntry(m_match);
MxListEntry<T> *m_next = m_match->m_next;
if (m_prev)
m_prev->m_next = m_next;
else
m_list->m_first = m_next;
if (m_next)
m_next->m_prev = m_prev;
else
m_list->m_last = m_prev;
delete m_match;
m_list->m_count--;
m_match = NULL; m_match = NULL;
} }