diff --git a/LEGO1/mxregion.cpp b/LEGO1/mxregion.cpp index ac2353ba..8cdee2c1 100644 --- a/LEGO1/mxregion.cpp +++ b/LEGO1/mxregion.cpp @@ -3,6 +3,8 @@ #include DECOMP_SIZE_ASSERT(MxRegion, 0x1c); +DECOMP_SIZE_ASSERT(MxRegionTopBottom, 0x0c); +DECOMP_SIZE_ASSERT(MxRegionLeftRight, 0x08); // OFFSET: LEGO1 0x100c31c0 MxRegion::MxRegion() diff --git a/LEGO1/mxregionlist.cpp b/LEGO1/mxregionlist.cpp index a25cda73..92e9a010 100644 --- a/LEGO1/mxregionlist.cpp +++ b/LEGO1/mxregionlist.cpp @@ -1,12 +1,6 @@ #include "mxregionlist.h" #include "mxregion.h" -// OFFSET: LEGO1 0x100c4e80 -void MxRegionLeftRightListParent::Destroy(MxRegionLeftRight *p_leftRight) -{ - delete p_leftRight; -} - // OFFSET: LEGO1 0x100c33e0 void MxRegionListParent::Destroy(MxRegionTopBottom *p_topBottom) { @@ -15,4 +9,10 @@ void MxRegionListParent::Destroy(MxRegionTopBottom *p_topBottom) delete p_topBottom->m_leftRightList; delete p_topBottom; } +} + +// OFFSET: LEGO1 0x100c4e80 +void MxRegionLeftRightListParent::Destroy(MxRegionLeftRight *p_leftRight) +{ + delete p_leftRight; } \ No newline at end of file diff --git a/LEGO1/mxregionlist.h b/LEGO1/mxregionlist.h index 1dcc8865..435ce1ad 100644 --- a/LEGO1/mxregionlist.h +++ b/LEGO1/mxregionlist.h @@ -3,24 +3,8 @@ #include "mxlist.h" -struct MxRegionLeftRight; struct MxRegionTopBottom; - -// VTABLE 0x100dcc70 -// SIZE 0x18 -class MxRegionLeftRightListParent : public MxList -{ -public: - static void Destroy(MxRegionLeftRight *p_leftRight); - - MxRegionLeftRightListParent() { - m_customDestructor = Destroy; - } -}; - -// VTABLE 0x100dcc88 -// SIZE 0x18 -class MxRegionLeftRightList : public MxRegionLeftRightListParent {}; +struct MxRegionLeftRight; // VTABLE 0x100dcb40 // SIZE 0x18 @@ -38,4 +22,20 @@ public: // SIZE 0x18 class MxRegionList : public MxRegionListParent {}; +// VTABLE 0x100dcc70 +// SIZE 0x18 +class MxRegionLeftRightListParent : public MxList +{ +public: + static void Destroy(MxRegionLeftRight *p_leftRight); + + MxRegionLeftRightListParent() { + m_customDestructor = Destroy; + } +}; + +// VTABLE 0x100dcc88 +// SIZE 0x18 +class MxRegionLeftRightList : public MxRegionLeftRightListParent {}; + #endif // MXREGIONLIST_H