From c95feb2e4afeaf1526dde59b95afe09a618eb452 Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Mon, 15 Jan 2024 13:29:52 -0500 Subject: [PATCH] Fixes --- LEGO1/lego/legoomni/include/mxcontrolpresenter.h | 6 +++--- .../legoomni/src/control/mxcontrolpresenter.cpp | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/LEGO1/lego/legoomni/include/mxcontrolpresenter.h b/LEGO1/lego/legoomni/include/mxcontrolpresenter.h index 6e456851..c7f79f82 100644 --- a/LEGO1/lego/legoomni/include/mxcontrolpresenter.h +++ b/LEGO1/lego/legoomni/include/mxcontrolpresenter.h @@ -33,8 +33,8 @@ class MxControlPresenter : public MxCompositePresenter { 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(MxBool p_undefined); // vtable+0x68 - virtual void VTable0x6c(MxU32 p_new4e); // vtable+0x6c + virtual void VTable0x68(MxBool p_unk0x50); // vtable+0x68 + virtual void VTable0x6c(undefined4); // vtable+0x6c private: MxBool FUN_10044270(undefined4, undefined4, undefined4*); @@ -42,7 +42,7 @@ class MxControlPresenter : public MxCompositePresenter { void FUN_10044540(undefined2); undefined2 m_unk0x4c; // 0x4c - MxS16 m_unk0x4e; // 0x4e + MxU16 m_unk0x4e; // 0x4e MxBool m_unk0x50; // 0x50 undefined2 m_unk0x52; // 0x52 undefined2 m_unk0x54; // 0x54 diff --git a/LEGO1/lego/legoomni/src/control/mxcontrolpresenter.cpp b/LEGO1/lego/legoomni/src/control/mxcontrolpresenter.cpp index 8f6183f0..4a550241 100644 --- a/LEGO1/lego/legoomni/src/control/mxcontrolpresenter.cpp +++ b/LEGO1/lego/legoomni/src/control/mxcontrolpresenter.cpp @@ -29,9 +29,9 @@ MxBool MxControlPresenter::VTable0x64(undefined4 p_undefined) } // FUNCTION: LEGO1 0x10043ff0 -void MxControlPresenter::VTable0x68(MxBool p_undefined) +void MxControlPresenter::VTable0x68(MxBool p_unk0x50) { - m_unk0x50 = p_undefined; + m_unk0x50 = p_unk0x50; } // FUNCTION: LEGO1 0x10044110 @@ -105,7 +105,7 @@ MxBool MxControlPresenter::FUN_10044480(undefined4, undefined4*) } // STUB: LEGO1 0x10044540 -void MxControlPresenter::VTable0x6c(MxU32 p_new4e) +void MxControlPresenter::VTable0x6c(undefined4) { // TODO } @@ -130,12 +130,13 @@ void MxControlPresenter::Enable(MxBool p_enable) if (MxPresenter::IsEnabled() != p_enable) { MxPresenter::Enable(p_enable); - MxU8 i = 0; + MxU16 i = 0; for (MxCompositePresenterList::iterator it = m_list.begin(); it != m_list.end(); it++) { if (i == m_unk0x4e) { (*it)->Enable((m_unk0x4c != 3 || i != 0) ? p_enable : 0); break; } + i++; } @@ -149,9 +150,8 @@ void MxControlPresenter::Enable(MxBool p_enable) MxBool MxControlPresenter::HasTickleStatePassed(TickleState p_tickleState) { MxCompositePresenterList::iterator it = m_list.begin(); - for (MxU8 i = m_unk0x4e; i != 0; i--) { - it++; - } + for (MxS16 i = m_unk0x4e; i > 0; i--, it++) + ; return (*it)->HasTickleStatePassed(p_tickleState); }