diff --git a/LEGO1/mxdsactionlist.h b/LEGO1/mxdsactionlist.h index 19929d20..fde9dea9 100644 --- a/LEGO1/mxdsactionlist.h +++ b/LEGO1/mxdsactionlist.h @@ -26,6 +26,9 @@ class MxDSActionList : public MxList { undefined m_unk18; }; -typedef MxListCursorChild MxDSActionListCursor; +class MxDSActionListCursor : public MxListCursor { +public: + MxDSActionListCursor(MxDSActionList* p_list) : MxListCursor(p_list){}; +}; #endif // MXDSACTIONLIST_H diff --git a/LEGO1/mxlist.h b/LEGO1/mxlist.h index d44d6c8f..8ca3d199 100644 --- a/LEGO1/mxlist.h +++ b/LEGO1/mxlist.h @@ -100,18 +100,10 @@ class MxListCursor : public MxCore { MxListEntry* m_match; }; -// Unclear purpose template -class MxListCursorChild : public MxListCursor { +class MxPtrListCursor : public MxListCursor { public: - MxListCursorChild(MxList* p_list) : MxListCursor(p_list) {} -}; - -// Unclear purpose -template -class MxListCursorChildChild : public MxListCursorChild { -public: - MxListCursorChildChild(MxList* p_list) : MxListCursorChild(p_list) {} + MxPtrListCursor(MxPtrList* p_list) : MxListCursor(p_list){}; }; template diff --git a/LEGO1/mxpresenterlist.h b/LEGO1/mxpresenterlist.h index d96374b9..524c4472 100644 --- a/LEGO1/mxpresenterlist.h +++ b/LEGO1/mxpresenterlist.h @@ -15,7 +15,10 @@ class MxPresenterList : public MxPtrList { virtual MxS8 Compare(MxPresenter*, MxPresenter*) override; // vtable+0x14 }; -typedef MxListCursorChildChild MxPresenterListCursor; +class MxPresenterListCursor : public MxPtrListCursor { +public: + MxPresenterListCursor(MxPresenterList* p_list) : MxPtrListCursor(p_list){}; +}; // VTABLE: LEGO1 0x100d6350 // class MxCollection diff --git a/LEGO1/mxregionlist.h b/LEGO1/mxregionlist.h index 3aa0487b..7ad8403e 100644 --- a/LEGO1/mxregionlist.h +++ b/LEGO1/mxregionlist.h @@ -24,12 +24,10 @@ class MxRegionList : public MxPtrList { }; // VTABLE: LEGO1 0x100dcb88 -// class MxListCursorChildChild -typedef MxListCursorChildChild MxRegionListCursor; - -// VTABLE: LEGO1 0x100dcc10 -// class MxListCursorChildChild -typedef MxListCursorChildChild MxRegionLeftRightListCursor; +class MxRegionListCursor : public MxPtrListCursor { +public: + MxRegionListCursor(MxRegionList* p_list) : MxPtrListCursor(p_list){}; +}; // VTABLE: LEGO1 0x100dcc40 // class MxCollection @@ -48,4 +46,10 @@ class MxRegionLeftRightList : public MxPtrList { static void Destroy(MxRegionLeftRight*); }; +// VTABLE: LEGO1 0x100dcc10 +class MxRegionLeftRightListCursor : public MxPtrListCursor { +public: + MxRegionLeftRightListCursor(MxRegionLeftRightList* p_list) : MxPtrListCursor(p_list){}; +}; + #endif // MXREGIONLIST_H diff --git a/LEGO1/mxstreamchunklist.h b/LEGO1/mxstreamchunklist.h index 4924b6ff..e92c777e 100644 --- a/LEGO1/mxstreamchunklist.h +++ b/LEGO1/mxstreamchunklist.h @@ -23,6 +23,9 @@ class MxStreamChunkList : public MxList { static void Destroy(MxStreamChunk* p_chunk); }; -typedef MxListCursorChild MxStreamChunkListCursor; +class MxStreamChunkListCursor : public MxListCursor { +public: + MxStreamChunkListCursor(MxStreamChunkList* p_list) : MxListCursor(p_list){}; +}; #endif // MXSTREAMCHUNKLIST_H diff --git a/LEGO1/mxstringlist.h b/LEGO1/mxstringlist.h index 08754405..89aeb3b9 100644 --- a/LEGO1/mxstringlist.h +++ b/LEGO1/mxstringlist.h @@ -9,6 +9,9 @@ class MxStringList : public MxList {}; // VTABLE: LEGO1 0x100dd058 -typedef MxListCursorChild MxStringListCursor; +class MxStringListCursor : public MxListCursor { +public: + MxStringListCursor(MxStringList* p_list) : MxListCursor(p_list){}; +}; #endif // MXSTRINGLIST_H