diff --git a/LEGO1/mxmediapresenter.h b/LEGO1/mxmediapresenter.h index 200cbcc1..167b10c1 100644 --- a/LEGO1/mxmediapresenter.h +++ b/LEGO1/mxmediapresenter.h @@ -13,9 +13,9 @@ class MxMediaPresenter : public MxPresenter { Init(); } - ~MxMediaPresenter(); + virtual ~MxMediaPresenter() override; - virtual MxResult Tickle() override; // vtable+0x8, override MxCore + virtual MxResult Tickle() override; // OFFSET: LEGO1 0x1000c5c0 inline virtual const char *ClassName() const override // vtable+0xc @@ -30,14 +30,14 @@ class MxMediaPresenter : public MxPresenter return !strcmp(name, MxMediaPresenter::ClassName()) || MxPresenter::IsA(name); } - virtual void StreamingTickle() override; // vtable+0x20, override MxPresenter - virtual void RepeatingTickle() override; // vtable+0x24, override MxPresenter - virtual void DoneTickle() override; // vtable+0x2c, override MxPresenter - virtual void InitVirtual() override; // vtable+0x38, override MxPresenter - virtual MxLong StartAction(MxStreamController *, MxDSAction *) override; // vtable+0x3c, override MxPresenter - virtual void EndAction() override; // vtable+0x40, override MxPresenter - virtual void Enable(MxBool p_enable) override; //vtable+0x54, override MxPresenter - virtual void VTable0x58(); // vtable+0x58 + virtual void StreamingTickle() override; + virtual void RepeatingTickle() override; + virtual void DoneTickle() override; + virtual void InitVirtual() override; + virtual MxLong StartAction(MxStreamController *, MxDSAction *) override; + virtual void EndAction() override; + virtual void Enable(MxBool p_enable) override; + virtual void VTable0x58(); undefined4 m_unk40; undefined4 m_unk44; diff --git a/LEGO1/mxpresenter.h b/LEGO1/mxpresenter.h index 9b4b61b7..959533c5 100644 --- a/LEGO1/mxpresenter.h +++ b/LEGO1/mxpresenter.h @@ -78,7 +78,6 @@ class MxPresenter : public MxCore protected: __declspec(dllexport) void Init(); void SendTo_unkPresenter(MxOmni *); - TickleState m_currentTickleState; // 0x8 MxU32 m_previousTickleStates; MxPoint32 m_location;