diff --git a/LEGO1/mxcontrolpresenter.cpp b/LEGO1/mxcontrolpresenter.cpp index 07802a08..666fbca7 100644 --- a/LEGO1/mxcontrolpresenter.cpp +++ b/LEGO1/mxcontrolpresenter.cpp @@ -16,6 +16,24 @@ MxControlPresenter::MxControlPresenter() this->m_unk0x54 = 0; } +// FUNCTION: LEGO1 0x10043fd0 +void MxControlPresenter::RepeatingTickle() +{ + // Intentionally empty +} + +// FUNCTION: LEGO1 0x10043fe0 +MxBool MxControlPresenter::VTable0x64(undefined4 p_undefined) +{ + return this->m_unk0x50; +} + +// FUNCTION: LEGO1 0x10043ff0 +void MxControlPresenter::VTable0x68(undefined p_undefined) +{ + this->m_unk0x50 = p_undefined; +} + // FUNCTION: LEGO1 0x10044110 MxControlPresenter::~MxControlPresenter() { @@ -24,6 +42,20 @@ MxControlPresenter::~MxControlPresenter() } } +// FUNCTION: LEGO1 0x10044180 +MxResult MxControlPresenter::AddToManager() +{ + this->m_unk0x4e = 0; + return SUCCESS; +} + +// STUB: LEGO1 0x10044190 +MxResult MxControlPresenter::StartAction(MxStreamController* p_controller, MxDSAction* p_action) +{ + // TODO + return FAILURE; +} + // FUNCTION: LEGO1 0x10044610 void MxControlPresenter::ReadyTickle() { @@ -33,3 +65,28 @@ void MxControlPresenter::ReadyTickle() m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState; m_currentTickleState = TickleState_Repeating; } + +// STUB: LEGO1 0x10044540 +void MxControlPresenter::VTable0x6C(undefined2 p_undefined) +{ + // TODO +} + +// STUB: LEGO1 0x10044640 +void MxControlPresenter::ParseExtra() +{ + // TODO +} + +// STUB: LEGO1 0x10044820 +void MxControlPresenter::Enable(MxBool p_enable) +{ + // TODO +} + +// STUB: LEGO1 0x100448a0 +MxBool MxControlPresenter::HasTickleStatePassed(TickleState p_tickleState) +{ + // TODO + return FALSE; +} \ No newline at end of file diff --git a/LEGO1/mxcontrolpresenter.h b/LEGO1/mxcontrolpresenter.h index dfe104bf..3627d347 100644 --- a/LEGO1/mxcontrolpresenter.h +++ b/LEGO1/mxcontrolpresenter.h @@ -3,6 +3,8 @@ #include "decomp.h" #include "mxcompositepresenter.h" +#include "mxdsaction.h" +#include "mxstreamcontroller.h" // VTABLE: LEGO1 0x100d7b88 // SIZE 0x5c @@ -25,7 +27,17 @@ class MxControlPresenter : public MxCompositePresenter { } virtual void ReadyTickle() override; // vtable+0x18 + virtual void RepeatingTickle() override; // vtable+0x24 + virtual void ParseExtra() override; // vtable+0x30 + virtual MxResult AddToManager() override; // vtable+0x34 + virtual MxResult StartAction(MxStreamController* p_controller, MxDSAction* p_action) override; // vtable+0x3c + virtual MxBool HasTickleStatePassed(TickleState p_tickleState) override; // vtable+0x48 + virtual void Enable(MxBool p_enable) override; // vtable+0x54 + virtual MxBool VTable0x64(undefined4 p_undefined) override; // vtable+0x64 + + virtual void VTable0x68(undefined p_undefined); + virtual void VTable0x6C(undefined2 p_undefined); private: undefined2 m_unk0x4c; MxS16 m_unk0x4e;