From ff32ae63838132a99efffe89c26fa1b2d6fcc29a Mon Sep 17 00:00:00 2001 From: Misha <106913236+MishaProductions@users.noreply.github.com> Date: Mon, 15 Jan 2024 13:34:49 -0500 Subject: [PATCH] reorder --- .../lego/legoomni/include/legoanimpresenter.h | 65 ++++++++++--------- .../legoomni/src/video/legoanimpresenter.cpp | 22 +++---- 2 files changed, 47 insertions(+), 40 deletions(-) diff --git a/LEGO1/lego/legoomni/include/legoanimpresenter.h b/LEGO1/lego/legoomni/include/legoanimpresenter.h index bc691f4b..72dcf102 100644 --- a/LEGO1/lego/legoomni/include/legoanimpresenter.h +++ b/LEGO1/lego/legoomni/include/legoanimpresenter.h @@ -6,35 +6,7 @@ class LegoWorld; class LegoMemoryStream; - -// VTALBE: LEGO1 0x100db768 -class LegoAnimClassBase { -public: - LegoAnimClassBase(); - virtual ~LegoAnimClassBase(); - - virtual void VTable0x4(); - virtual void VTable0x8(); - virtual void VTable0xc(); - - undefined4 m_unk0x4; -}; - -// VTALBE: LEGO1 0x100db8d8 -class LegoAnimClass : public LegoAnimClassBase { -public: - LegoAnimClass(); - virtual ~LegoAnimClass() override; - - virtual void VTable0x8() override; - virtual void VTable0xc() override; - virtual MxResult VTable0x10(LegoMemoryStream* p_stream, MxS32); - - undefined4 m_unk0x8; - undefined4 m_unk0xc; - undefined4 m_unk0x10; - undefined4 m_unk0x14; -}; +class LegoAnimClass; // VTABLE: LEGO1 0x100d90c8 class LegoAnimPresenter : public MxVideoPresenter { @@ -96,4 +68,39 @@ class LegoAnimPresenter : public MxVideoPresenter { // SYNTHETIC: LEGO1 0x10068650 // LegoAnimPresenter::`scalar deleting destructor' +// VTABLE: LEGO1 0x100db768 +class LegoAnimClassBase { +public: + LegoAnimClassBase(); + virtual ~LegoAnimClassBase(); + + virtual void VTable0x4(); + virtual void VTable0x8(); + virtual void VTable0xc(); + + undefined4 m_unk0x4; +}; + +// SYNTHETIC: LEGO1 0x10099e00 +// LegoAnimClassBase::`scalar deleting destructor' + +// VTABLE: LEGO1 0x100db8d8 +class LegoAnimClass : public LegoAnimClassBase { +public: + LegoAnimClass(); + virtual ~LegoAnimClass() override; + + virtual void VTable0x8() override; + virtual void VTable0xc() override; + virtual MxResult VTable0x10(LegoMemoryStream* p_stream, MxS32); + + undefined4 m_unk0x8; + undefined4 m_unk0xc; + undefined4 m_unk0x10; + undefined4 m_unk0x14; +}; + +// SYNTHETIC: LEGO1 0x100a0ba0 +// LegoAnimClass::`scalar deleting destructor' + #endif // LEGOANIMPRESENTER_H diff --git a/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp b/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp index a18397d7..dd4f3083 100644 --- a/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp +++ b/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp @@ -77,14 +77,6 @@ void LegoAnimPresenter::ReadyTickle() } } -// FUNCTION: LEGO1 0x1006c620 -MxResult LegoAnimPresenter::StartAction(MxStreamController* p_controller, MxDSAction* p_action) -{ - MxResult result = MxVideoPresenter::StartAction(p_controller, p_action); - m_displayZ = 0; - return result; -} - // STUB: LEGO1 0x1006b5e0 void LegoAnimPresenter::StartingTickle() { @@ -119,10 +111,12 @@ void LegoAnimPresenter::ParseExtra() // TODO } -// FUNCTION: LEGO1 0x1006b8e0 -void LegoAnimPresenter::Destroy() +// FUNCTION: LEGO1 0x1006c620 +MxResult LegoAnimPresenter::StartAction(MxStreamController* p_controller, MxDSAction* p_action) { - Destroy(FALSE); + MxResult result = MxVideoPresenter::StartAction(p_controller, p_action); + m_displayZ = 0; + return result; } // STUB: LEGO1 0x1006c640 @@ -132,6 +126,12 @@ void LegoAnimPresenter::EndAction() MxVideoPresenter::EndAction(); } +// FUNCTION: LEGO1 0x1006b8e0 +void LegoAnimPresenter::Destroy() +{ + Destroy(FALSE); +} + // STUB: LEGO1 0x1006ad30 void LegoAnimPresenter::PutFrame() {