diff --git a/LEGO1/mxdiskstreamcontroller.h b/LEGO1/mxdiskstreamcontroller.h index 703b3bf2..3fc5111f 100644 --- a/LEGO1/mxdiskstreamcontroller.h +++ b/LEGO1/mxdiskstreamcontroller.h @@ -17,14 +17,7 @@ public: MxDiskStreamController(); virtual ~MxDiskStreamController() override; - virtual MxResult Tickle() override; // vtable+0x8 - virtual MxResult Open(const char* p_filename) override; // vtable+0x14 - virtual MxResult VTable0x18(undefined4, undefined4) override; // vtable+0x18 - virtual MxResult VTable0x20(MxDSAction* p_action) override; // vtable+0x20 - virtual MxResult VTable0x24(MxDSAction* p_action) override; // vtable+0x24 - virtual MxDSStreamingAction* VTable0x28() override; // vtable+0x28 - virtual MxResult VTable0x30(MxDSAction* p_action) override; // vtable+0x30 - virtual MxResult VTable0x34(undefined4); // vtable+0x34 + virtual MxResult Tickle() override; // vtable+0x8 // FUNCTION: LEGO1 0x100c7360 inline virtual const char* ClassName() const override // vtable+0x0c @@ -39,6 +32,14 @@ public: return !strcmp(p_name, MxDiskStreamController::ClassName()) || MxStreamController::IsA(p_name); } + virtual MxResult Open(const char* p_filename) override; // vtable+0x14 + virtual MxResult VTable0x18(undefined4, undefined4) override; // vtable+0x18 + virtual MxResult VTable0x20(MxDSAction* p_action) override; // vtable+0x20 + virtual MxResult VTable0x24(MxDSAction* p_action) override; // vtable+0x24 + virtual MxDSStreamingAction* VTable0x28() override; // vtable+0x28 + virtual MxResult VTable0x30(MxDSAction* p_action) override; // vtable+0x30 + virtual MxResult VTable0x34(undefined4); // vtable+0x34 + inline MxBool GetUnk0xc4() const { return m_unk0xc4; } void FUN_100c7f40(MxDSStreamingAction* p_streamingaction); diff --git a/LEGO1/mxregion.h b/LEGO1/mxregion.h index be15a672..c7d7dd90 100644 --- a/LEGO1/mxregion.h +++ b/LEGO1/mxregion.h @@ -13,16 +13,16 @@ public: MxRegion(); virtual ~MxRegion() override; - virtual void Reset(); - virtual void VTable0x18(MxRect32& p_rect); - virtual MxBool VTable0x1c(MxRect32& p_rect); - virtual MxBool VTable0x20(); + virtual void Reset(); // vtable+0x14 + virtual void VTable0x18(MxRect32& p_rect); // vtable+0x18 + virtual MxBool VTable0x1c(MxRect32& p_rect); // vtable+0x1c + virtual MxBool VTable0x20(); // vtable+0x20 inline MxRect32& GetRect() { return this->m_rect; } private: - MxRegionList* m_list; - MxRect32 m_rect; + MxRegionList* m_list; // 0x08 + MxRect32 m_rect; // 0x0c }; #endif // MXREGION_H