Merge branch 'master' into mxregion

This commit is contained in:
Christian Semmler
2023-10-25 06:36:49 -04:00
411 changed files with 14188 additions and 12820 deletions

View File

@@ -1,62 +1,56 @@
#ifndef MXREGION_H
#define MXREGION_H
#include "mxcore.h"
#include "mxregionlist.h"
#include "mxrect32.h"
#include "decomp.h"
#include "mxcore.h"
#include "mxrect32.h"
#include "mxregionlist.h"
// SIZE 0x0c
struct MxRegionTopBottom
{
MxRegionTopBottom(MxRect32 &p_rect);
MxRegionTopBottom(MxS32 m_top, MxS32 m_bottom);
struct MxRegionTopBottom {
MxRegionTopBottom(MxRect32& p_rect);
MxRegionTopBottom(MxS32 m_top, MxS32 m_bottom);
MxRegionTopBottom *Clone();
void FUN_100c5280(MxS32 p_left, MxS32 p_right);
MxBool FUN_100c57b0(MxRect32 &p_rect);
MxRegionTopBottom* Clone();
void FUN_100c5280(MxS32 p_left, MxS32 p_right);
MxBool FUN_100c57b0(MxRect32& p_rect);
MxS32 m_top;
MxS32 m_bottom;
MxRegionLeftRightList *m_leftRightList;
MxS32 m_top;
MxS32 m_bottom;
MxRegionLeftRightList* m_leftRightList;
};
// SIZE 0x08
struct MxRegionLeftRight
{
MxRegionLeftRight(MxS32 p_left, MxS32 p_right)
{
m_left = p_left;
m_right = p_right;
}
struct MxRegionLeftRight {
MxRegionLeftRight(MxS32 p_left, MxS32 p_right)
{
m_left = p_left;
m_right = p_right;
}
MxRegionLeftRight *Clone()
{
return new MxRegionLeftRight(m_left, m_right);
}
MxRegionLeftRight* Clone() { return new MxRegionLeftRight(m_left, m_right); }
MxS32 m_left;
MxS32 m_right;
MxS32 m_left;
MxS32 m_right;
};
// VTABLE 0x100dcae8
// SIZE 0x1c
class MxRegion : public MxCore
{
class MxRegion : public MxCore {
public:
MxRegion();
virtual ~MxRegion() override;
MxRegion();
virtual ~MxRegion() override;
virtual void Reset();
virtual void vtable18(MxRect32 &p_rect);
virtual MxBool vtable1c(MxRect32 &p_rect);
virtual MxBool vtable20();
virtual void Reset();
virtual void vtable18(MxRect32& p_rect);
virtual MxBool vtable1c(MxRect32& p_rect);
virtual MxBool vtable20();
inline MxRect32 &GetRect() { return this->m_rect; }
inline MxRect32& GetRect() { return this->m_rect; }
private:
MxRegionList *m_list;
MxRect32 m_rect;
MxRegionList* m_list;
MxRect32 m_rect;
};
#endif // MXREGION_H