diff --git a/LEGO1/lego/legoomni/include/legoanimationmanager.h b/LEGO1/lego/legoomni/include/legoanimationmanager.h index beaf23a4..a9b7888d 100644 --- a/LEGO1/lego/legoomni/include/legoanimationmanager.h +++ b/LEGO1/lego/legoomni/include/legoanimationmanager.h @@ -4,6 +4,7 @@ #include "animstate.h" #include "decomp.h" #include "mxcore.h" +#include "traninfo.h" // SIZE 0x18 struct Character { @@ -12,68 +13,6 @@ struct Character { MxBool m_active; // 0x14 }; -void LegoUnknown100d8ca8Handler(); -void LegoUnknown100d8cd8Handler(); - -// VTABLE: LEGO1 0x100d8ca8 -// SIZE 0x10 -class LegoUnknown100d8ca8 : public MxCore { -public: - inline LegoUnknown100d8ca8() - { - m_unk0x8 = 0; - SetHandler(LegoUnknown100d8ca8Handler); - } - // FUNCTION: LEGO1 0x1005fdf0 - virtual MxU8 VTable0x14() { return 0; } - inline void SetHandler(void (*p_handler)()) { m_unk0xc = p_handler; } - - // SYNTHETIC: LEGO1 0x1005ffb0 - // LegoUnknown100d8ca8::`scalar deleting destructor' - -private: - MxU32 m_unk0x8; // 0x08 - void (*m_unk0xc)(); // 0x0c -}; - -// VTABLE: LEGO1 0x100d8cc0 -// SIZE 0x18 -class LegoUnknown100d8cc0 : public LegoUnknown100d8ca8 { -public: - inline LegoUnknown100d8cc0() { m_unk0x10 = m_unk0x14 = 0; } - - // SYNTHETIC: LEGO1 0x10060020 - // LegoUnknown100d8cc0::`scalar deleting destructor' - -private: - MxU32 m_unk0x10; // 0x10 - MxU32 m_unk0x14; // 0x14 -}; - -// VTABLE: LEGO1 0x100d8cd8 -// SIZE 0x18 -class LegoUnknown100d8cd8 : public LegoUnknown100d8cc0 { -public: - inline LegoUnknown100d8cd8(MxBool p_mode) { SetHandler(p_mode); } - inline void SetHandler(MxBool p_mode) - { - LegoUnknown100d8ca8::SetHandler(p_mode ? LegoUnknown100d8cd8Handler : LegoUnknown100d8ca8Handler); - } - - // SYNTHETIC: LEGO1 0x100600d0 - // LegoUnknown100d8cd8::`scalar deleting destructor' -}; - -// VTABLE: LEGO1 0x100d8c90 -// SIZE 0x18 -class LegoUnknown100d8c90 : public LegoUnknown100d8cd8 { -public: - inline LegoUnknown100d8c90() : LegoUnknown100d8cd8(FALSE) {} - - // SYNTHETIC: LEGO1 0x1005fef0 - // LegoUnknown100d8c90::`scalar deleting destructor' -}; - // VTABLE: LEGO1 0x100d8c18 // SIZE 0x500 class LegoAnimationManager : public MxCore { @@ -119,34 +58,34 @@ class LegoAnimationManager : public MxCore { private: void Init(); - undefined4 m_unk0x08; // 0x08 - MxU16 m_animCount; // 0x0c - MxU16 m_unk0x0e; // 0x0e - MxU32 m_unk0x10; // 0x10 - AnimInfo* m_anims; // 0x14 - undefined m_unk0x018[8]; // 0x18 - LegoUnknown100d8c90* m_tranInfoList; // 0x20 - LegoUnknown100d8c90* m_tranInfoList2; // 0x24 - undefined4 m_unk0x28[2]; // 0x28 - undefined4 m_unk0x30[2]; // 0x30 - undefined m_unk0x38; // 0x38 - undefined m_unk0x39; // 0x39 - undefined m_unk0x3a; // 0x3a - undefined m_unk0x3b[0x3c1]; // 0x3b - undefined4 m_unk0x3fc; // 0x3fc - MxU8 m_unk0x400; // 0x400 - undefined m_unk0x401; // 0x401 - MxU8 m_unk0x402; // 0x402 - undefined m_unk0x403[0x1d]; // 0x403 - AnimState* m_animState; // 0x420 - undefined4 m_unk0x424; // 0x424 - undefined m_unk0x428; // 0x428 - undefined m_unk0x429; // 0x429 - undefined m_unk0x42a; // 0x42a - undefined m_unk0x42b; // 0x42b - undefined4 m_unk0x42c; // 0x42c - undefined m_unk0x430; // 0x430 - undefined m_unk0x431[0xcf]; // 0x431 + undefined4 m_unk0x08; // 0x08 + MxU16 m_animCount; // 0x0c + MxU16 m_unk0x0e; // 0x0e + MxU32 m_unk0x10; // 0x10 + AnimInfo* m_anims; // 0x14 + undefined m_unk0x018[8]; // 0x18 + TranInfoList* m_tranInfoList; // 0x20 + TranInfoList* m_tranInfoList2; // 0x24 + undefined4 m_unk0x28[2]; // 0x28 + undefined4 m_unk0x30[2]; // 0x30 + undefined m_unk0x38; // 0x38 + undefined m_unk0x39; // 0x39 + undefined m_unk0x3a; // 0x3a + undefined m_unk0x3b[0x3c1]; // 0x3b + undefined4 m_unk0x3fc; // 0x3fc + MxU8 m_unk0x400; // 0x400 + undefined m_unk0x401; // 0x401 + MxU8 m_unk0x402; // 0x402 + undefined m_unk0x403[0x1d]; // 0x403 + AnimState* m_animState; // 0x420 + undefined4 m_unk0x424; // 0x424 + undefined m_unk0x428; // 0x428 + undefined m_unk0x429; // 0x429 + undefined m_unk0x42a; // 0x42a + undefined m_unk0x42b; // 0x42b + undefined4 m_unk0x42c; // 0x42c + undefined m_unk0x430; // 0x430 + undefined m_unk0x431[0xcf]; // 0x431 }; #endif // LEGOANIMATIONMANAGER_H diff --git a/LEGO1/lego/legoomni/include/traninfo.h b/LEGO1/lego/legoomni/include/traninfo.h new file mode 100644 index 00000000..02e6bc51 --- /dev/null +++ b/LEGO1/lego/legoomni/include/traninfo.h @@ -0,0 +1,77 @@ +#ifndef TRANINFO_H +#define TRANINFO_H + +#include "mxlist.h" +#include "mxtypes.h" + +// SIZE 0x78 +struct TranInfo { // See FUN_100609f0 for construction + undefined m_unk0x00[0x78]; // 0x00 +}; + +// VTABLE: LEGO1 0x100d8c90 +// SIZE 0x18 +class TranInfoList : public MxPtrList { +public: + TranInfoList(MxBool p_ownership = FALSE) : MxPtrList(p_ownership) {} +}; + +// VTABLE: LEGO1 0x100d8ca8 +// class MxCollection + +// VTABLE: LEGO1 0x100d8cc0 +// class MxList + +// VTABLE: LEGO1 0x100d8cd8 +// class MxPtrList + +// VTABLE: LEGO1 0x100d8cf0 +// class MxListCursor + +// VTABLE: LEGO1 0x100d8d08 +// class MxPtrListCursor + +// VTABLE: LEGO1 0x100d8d20 +// SIZE 0x10 +class TranInfoListCursor : public MxPtrListCursor { +public: + TranInfoListCursor(TranInfoList* p_list) : MxPtrListCursor(p_list) {} +}; + +// TEMPLATE: LEGO1 0x1005fdf0 +// MxCollection::Compare + +// TEMPLATE: LEGO1 0x1005fe50 +// MxCollection::Destroy + +// SYNTHETIC: LEGO1 0x1005fef0 +// TranInfoList::`scalar deleting destructor' + +// SYNTHETIC: LEGO1 0x1005ffb0 +// MxCollection::`scalar deleting destructor' + +// SYNTHETIC: LEGO1 0x10060020 +// MxList::`scalar deleting destructor' + +// SYNTHETIC: LEGO1 0x100600d0 +// MxPtrList::`scalar deleting destructor' + +// SYNTHETIC: LEGO1 0x100612f0 +// TranInfoListCursor::`scalar deleting destructor' + +// SYNTHETIC: LEGO1 0x10061360 +// MxPtrListCursor::~MxPtrListCursor + +// SYNTHETIC: LEGO1 0x100613b0 +// MxListCursor::`scalar deleting destructor' + +// SYNTHETIC: LEGO1 0x10061420 +// MxPtrListCursor::`scalar deleting destructor' + +// TEMPLATE: LEGO1 0x10061490 +// MxListCursor::~MxListCursor + +// TEMPLATE: LEGO1 0x100614e0 +// TranInfoListCursor::~TranInfoListCursor + +#endif // TranInfoLIST_H