From 9bbe36eec64914259455b09e7016e6a43eec52c5 Mon Sep 17 00:00:00 2001 From: Misha <106913236+MishaProductions@users.noreply.github.com> Date: Thu, 18 Jan 2024 20:10:42 -0500 Subject: [PATCH] fix build --- LEGO1/lego/legoomni/include/infocenterdoor.h | 9 ++++++--- LEGO1/lego/legoomni/include/infocenterstate.h | 3 ++- .../lego/legoomni/src/infocenter/infocenterdoor.cpp | 6 ------ .../lego/legoomni/src/infocenter/infocenterstate.cpp | 6 ------ .../legoomni/src/infocenter/registrationbook.cpp | 12 ++++++------ 5 files changed, 14 insertions(+), 22 deletions(-) diff --git a/LEGO1/lego/legoomni/include/infocenterdoor.h b/LEGO1/lego/legoomni/include/infocenterdoor.h index 87b6e586..effb22cf 100644 --- a/LEGO1/lego/legoomni/include/infocenterdoor.h +++ b/LEGO1/lego/legoomni/include/infocenterdoor.h @@ -27,9 +27,12 @@ class InfocenterDoor : public LegoWorld { virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18 virtual void VTable0x50() override; // vtable+0x50 - virtual MxBool VTable0x5c() override; // vtable+0x5c - virtual MxBool VTable0x64() override; // vtable+0x64 - virtual void VTable0x68(MxBool p_add) override; // vtable+0x68 + + // FUNCTION: LEGO1 0x100377a0 + virtual MxBool VTable0x5c() override { return TRUE; } // vtable+0x5c + + virtual MxBool VTable0x64() override; // vtable+0x64 + virtual void VTable0x68(MxBool p_add) override; // vtable+0x68 // SYNTHETIC: LEGO1 0x100378d0 // InfocenterDoor::`scalar deleting destructor' diff --git a/LEGO1/lego/legoomni/include/infocenterstate.h b/LEGO1/lego/legoomni/include/infocenterstate.h index 569a38e8..aaa45f56 100644 --- a/LEGO1/lego/legoomni/include/infocenterstate.h +++ b/LEGO1/lego/legoomni/include/infocenterstate.h @@ -24,7 +24,8 @@ class InfocenterState : public LegoState { return !strcmp(p_name, InfocenterState::ClassName()) || LegoState::IsA(p_name); } - virtual MxBool VTable0x14() override; // vtable+0x14 + // FUNCTION: LEGO1 0x10071830 + virtual MxBool VTable0x14() override { return FALSE; } // vtable+0x14 inline MxU32 GetInfocenterBufferElement(MxS32 p_index) { return m_buffer[p_index]; } inline MxU32 GetUnknown0x74() { return m_unk0x74; } diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp index 110ee8b6..fba344c0 100644 --- a/LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp +++ b/LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp @@ -36,12 +36,6 @@ void InfocenterDoor::VTable0x50() FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); } -// FUNCTION: LEGO1 0x100377a0 -MxBool InfocenterDoor::VTable0x5c() -{ - return TRUE; -} - // STUB: LEGO1 0x10037cd0 MxBool InfocenterDoor::VTable0x64() { diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenterstate.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenterstate.cpp index fd911544..96e47c55 100644 --- a/LEGO1/lego/legoomni/src/infocenter/infocenterstate.cpp +++ b/LEGO1/lego/legoomni/src/infocenter/infocenterstate.cpp @@ -14,9 +14,3 @@ InfocenterState::~InfocenterState() { // TODO } - -// FUNCTION: LEGO1 0x10071830 -MxBool InfocenterState::VTable0x14() -{ - return FALSE; -} diff --git a/LEGO1/lego/legoomni/src/infocenter/registrationbook.cpp b/LEGO1/lego/legoomni/src/infocenter/registrationbook.cpp index dabbd35b..f68bc29e 100644 --- a/LEGO1/lego/legoomni/src/infocenter/registrationbook.cpp +++ b/LEGO1/lego/legoomni/src/infocenter/registrationbook.cpp @@ -41,15 +41,15 @@ MxResult RegistrationBook::Tickle() return SUCCESS; } +// STUB: LEGO1 0x10078180 +void RegistrationBook::VTable0x68(MxBool p_add) +{ + // TODO +} + // FUNCTION: LEGO1 0x100783e0 MxBool RegistrationBook::VTable0x64() { DeleteObjects(&m_atom, 500, 506); return TRUE; } - -// STUB: LEGO1 0x10078180 -void RegistrationBook::VTable0x68(MxBool p_add) -{ - // TODO -}