isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-28 18:51:16 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
Christian Semmler 2024-01-15 13:29:52 -05:00
parent 7e91df4083
commit c95feb2e4a
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
LEGO1/lego/legoomni/include/mxcontrolpresenter.h
View File

@ -33,8 +33,8 @@ class MxControlPresenter : public MxCompositePresenter {
virtual MxBool HasTickleStatePassed(TickleState p_tickleState) override; // vtable+0x48 virtual MxBool HasTickleStatePassed(TickleState p_tickleState) override; // vtable+0x48
virtual void Enable(MxBool p_enable) override; // vtable+0x54 virtual void Enable(MxBool p_enable) override; // vtable+0x54
virtual MxBool VTable0x64(undefined4 p_undefined) override; // vtable+0x64 virtual MxBool VTable0x64(undefined4 p_undefined) override; // vtable+0x64
virtual void VTable0x68(MxBool p_undefined); // vtable+0x68 virtual void VTable0x68(MxBool p_unk0x50); // vtable+0x68
virtual void VTable0x6c(MxU32 p_new4e); // vtable+0x6c virtual void VTable0x6c(undefined4); // vtable+0x6c
private: private:
MxBool FUN_10044270(undefined4, undefined4, undefined4*); MxBool FUN_10044270(undefined4, undefined4, undefined4*);
@ -42,7 +42,7 @@ class MxControlPresenter : public MxCompositePresenter {
void FUN_10044540(undefined2); void FUN_10044540(undefined2);
undefined2 m_unk0x4c; // 0x4c undefined2 m_unk0x4c; // 0x4c
MxS16 m_unk0x4e; // 0x4e MxU16 m_unk0x4e; // 0x4e
MxBool m_unk0x50; // 0x50 MxBool m_unk0x50; // 0x50
undefined2 m_unk0x52; // 0x52 undefined2 m_unk0x52; // 0x52
undefined2 m_unk0x54; // 0x54 undefined2 m_unk0x54; // 0x54

14
LEGO1/lego/legoomni/src/control/mxcontrolpresenter.cpp
View File

@ -29,9 +29,9 @@ MxBool MxControlPresenter::VTable0x64(undefined4 p_undefined)
} }
// FUNCTION: LEGO1 0x10043ff0 // 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 // FUNCTION: LEGO1 0x10044110
@ -105,7 +105,7 @@ MxBool MxControlPresenter::FUN_10044480(undefined4, undefined4*)
} }
// STUB: LEGO1 0x10044540 // STUB: LEGO1 0x10044540
void MxControlPresenter::VTable0x6c(MxU32 p_new4e) void MxControlPresenter::VTable0x6c(undefined4)
{ {
// TODO // TODO
} }
@ -130,12 +130,13 @@ void MxControlPresenter::Enable(MxBool p_enable)
if (MxPresenter::IsEnabled() != p_enable) { if (MxPresenter::IsEnabled() != p_enable) {
MxPresenter::Enable(p_enable); MxPresenter::Enable(p_enable);
MxU8 i = 0; MxU16 i = 0;
for (MxCompositePresenterList::iterator it = m_list.begin(); it != m_list.end(); it++) { for (MxCompositePresenterList::iterator it = m_list.begin(); it != m_list.end(); it++) {
if (i == m_unk0x4e) { if (i == m_unk0x4e) {
(*it)->Enable((m_unk0x4c != 3 || i != 0) ? p_enable : 0); (*it)->Enable((m_unk0x4c != 3 || i != 0) ? p_enable : 0);
break; break;
} }
i++; i++;
} }
@ -149,9 +150,8 @@ void MxControlPresenter::Enable(MxBool p_enable)
MxBool MxControlPresenter::HasTickleStatePassed(TickleState p_tickleState) MxBool MxControlPresenter::HasTickleStatePassed(TickleState p_tickleState)
{ {
MxCompositePresenterList::iterator it = m_list.begin(); MxCompositePresenterList::iterator it = m_list.begin();
for (MxU8 i = m_unk0x4e; i != 0; i--) { for (MxS16 i = m_unk0x4e; i > 0; i--, it++)
it++; ;
}
return (*it)->HasTickleStatePassed(p_tickleState); return (*it)->HasTickleStatePassed(p_tickleState);
} }