From fe6aa40b1da87749e90fc9030ffa5eddf5e666c6 Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Mon, 20 Jan 2025 16:56:26 -0700 Subject: [PATCH] Order until `Infocenter` --- CMakeLists.txt | 5 +++-- LEGO1/lego/legoomni/include/jukebox.h | 4 +++- LEGO1/lego/legoomni/include/legohideanimpresenter.h | 8 ++++++-- LEGO1/lego/legoomni/include/legoinputmanager.h | 7 ++++++- LEGO1/lego/legoomni/include/police.h | 4 +++- LEGO1/lego/legoomni/src/input/legoinputmanager.cpp | 7 ------- .../lego/legoomni/src/video/legohideanimpresenter.cpp | 10 ---------- LEGO1/lego/legoomni/src/worlds/jukebox.cpp | 6 ------ LEGO1/lego/legoomni/src/worlds/police.cpp | 6 ------ 9 files changed, 21 insertions(+), 36 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2e2148c9..e1d59c00 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -363,14 +363,12 @@ function(add_lego_libraries NAME) LEGO1/lego/legoomni/src/entity/legonavcontroller.cpp LEGO1/lego/legoomni/src/paths/legopathboundary.cpp LEGO1/lego/legoomni/src/main/legomain.cpp - LEGO1/lego/legoomni/src/entity/legojetskiraceactor.cpp LEGO1/lego/legoomni/src/input/legoinputmanager.cpp LEGO1/lego/legoomni/src/race/legoracemap.cpp LEGO1/lego/legoomni/src/worlds/jukebox.cpp LEGO1/lego/legoomni/src/video/legoflctexturepresenter.cpp LEGO1/lego/legoomni/src/worlds/police.cpp LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp - LEGO1/lego/legoomni/src/build/legocarbuildpresenter.cpp LEGO1/lego/legoomni/src/entity/legopovcontroller.cpp LEGO1/lego/legoomni/src/common/legotextureinfo.cpp LEGO1/lego/legoomni/src/actors/doors.cpp @@ -381,6 +379,9 @@ function(add_lego_libraries NAME) LEGO1/lego/legoomni/src/video/legolocomotionanimpresenter.cpp LEGO1/lego/legoomni/src/video/legohideanimpresenter.cpp LEGO1/lego/legoomni/src/worlds/infocenter.cpp + + LEGO1/lego/legoomni/src/entity/legojetskiraceactor.cpp + LEGO1/lego/legoomni/src/build/legocarbuildpresenter.cpp LEGO1/lego/legoomni/src/race/raceskel.cpp LEGO1/lego/legoomni/src/worlds/act3.cpp LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp diff --git a/LEGO1/lego/legoomni/include/jukebox.h b/LEGO1/lego/legoomni/include/jukebox.h index 8196f454..e7a36668 100644 --- a/LEGO1/lego/legoomni/include/jukebox.h +++ b/LEGO1/lego/legoomni/include/jukebox.h @@ -59,6 +59,9 @@ class JukeBox : public LegoWorld { MxLong Notify(MxParam& p_param) override; // vtable+0x04 MxResult Tickle() override; // vtable+0x08 + // FUNCTION: LEGO1 0x1005d6e0 + MxBool VTable0x5c() override { return TRUE; } // vtable+0x5c + // FUNCTION: LEGO1 0x1005d6f0 // FUNCTION: BETA10 0x100388d0 const char* ClassName() const override // vtable+0x0c @@ -75,7 +78,6 @@ class JukeBox : public LegoWorld { MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18 void ReadyWorld() override; // vtable+0x50 - MxBool VTable0x5c() override; // vtable+0x5c MxBool Escape() override; // vtable+0x64 void Enable(MxBool p_enable) override; // vtable+0x68 diff --git a/LEGO1/lego/legoomni/include/legohideanimpresenter.h b/LEGO1/lego/legoomni/include/legohideanimpresenter.h index c04e2fe2..b2bbb7b8 100644 --- a/LEGO1/lego/legoomni/include/legohideanimpresenter.h +++ b/LEGO1/lego/legoomni/include/legohideanimpresenter.h @@ -25,6 +25,12 @@ class LegoHideAnimPresenter : public LegoLoopingAnimPresenter { LegoHideAnimPresenter(); ~LegoHideAnimPresenter() override; + // FUNCTION: LEGO1 0x1006d860 + void VTable0x8c() override {} // vtable+0x8c + + // FUNCTION: LEGO1 0x1006d870 + void VTable0x90() override {} // vtable+0x90 + // FUNCTION: BETA10 0x1005d4a0 static const char* HandlerClassName() { @@ -51,8 +57,6 @@ class LegoHideAnimPresenter : public LegoLoopingAnimPresenter { void Destroy() override; // vtable+0x38 void EndAction() override; // vtable+0x40 void PutFrame() override; // vtable+0x6c - void VTable0x8c() override; // vtable+0x8c - void VTable0x90() override; // vtable+0x90 void FUN_1006db40(LegoTime p_time); diff --git a/LEGO1/lego/legoomni/include/legoinputmanager.h b/LEGO1/lego/legoomni/include/legoinputmanager.h index 8f2b0693..9b47d7a8 100644 --- a/LEGO1/lego/legoomni/include/legoinputmanager.h +++ b/LEGO1/lego/legoomni/include/legoinputmanager.h @@ -87,7 +87,12 @@ class LegoInputManager : public MxPresenter { void Register(MxCore*); void UnRegister(MxCore*); - MxResult Tickle() override; // vtable+0x08 + // FUNCTION: LEGO1 0x1005b8b0 + MxResult Tickle() override + { + ProcessEvents(); + return SUCCESS; + } // vtable+0x08 // FUNCTION: LEGO1 0x1005b8c0 MxResult PutData() override { return SUCCESS; } // vtable+0x4c diff --git a/LEGO1/lego/legoomni/include/police.h b/LEGO1/lego/legoomni/include/police.h index e89ad3a7..39294cb1 100644 --- a/LEGO1/lego/legoomni/include/police.h +++ b/LEGO1/lego/legoomni/include/police.h @@ -59,6 +59,9 @@ class Police : public LegoWorld { MxLong Notify(MxParam& p_param) override; // vtable+0x04 + // FUNCTION: LEGO1 0x1005e1d0 + MxBool VTable0x5c() override { return TRUE; } // vtable+0x5c + // FUNCTION: LEGO1 0x1005e1e0 // FUNCTION: BETA10 0x100f0c50 const char* ClassName() const override // vtable+0x0c @@ -75,7 +78,6 @@ class Police : public LegoWorld { MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18 void ReadyWorld() override; // vtable+0x50 - MxBool VTable0x5c() override; // vtable+0x5c MxBool Escape() override; // vtable+0x64 void Enable(MxBool p_enable) override; // vtable+0x68 diff --git a/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp b/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp index 3aa0208c..e3523ca9 100644 --- a/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp +++ b/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp @@ -52,13 +52,6 @@ LegoInputManager::LegoInputManager() m_autoDragTime = 1000; } -// FUNCTION: LEGO1 0x1005b8b0 -MxResult LegoInputManager::Tickle() -{ - ProcessEvents(); - return SUCCESS; -} - // FUNCTION: LEGO1 0x1005b8f0 LegoInputManager::~LegoInputManager() { diff --git a/LEGO1/lego/legoomni/src/video/legohideanimpresenter.cpp b/LEGO1/lego/legoomni/src/video/legohideanimpresenter.cpp index 67d49941..0aef42bd 100644 --- a/LEGO1/lego/legoomni/src/video/legohideanimpresenter.cpp +++ b/LEGO1/lego/legoomni/src/video/legohideanimpresenter.cpp @@ -14,16 +14,6 @@ LegoHideAnimPresenter::LegoHideAnimPresenter() Init(); } -// FUNCTION: LEGO1 0x1006d860 -void LegoHideAnimPresenter::VTable0x8c() -{ -} - -// FUNCTION: LEGO1 0x1006d870 -void LegoHideAnimPresenter::VTable0x90() -{ -} - // FUNCTION: LEGO1 0x1006d9f0 LegoHideAnimPresenter::~LegoHideAnimPresenter() { diff --git a/LEGO1/lego/legoomni/src/worlds/jukebox.cpp b/LEGO1/lego/legoomni/src/worlds/jukebox.cpp index e7193307..a92f493d 100644 --- a/LEGO1/lego/legoomni/src/worlds/jukebox.cpp +++ b/LEGO1/lego/legoomni/src/worlds/jukebox.cpp @@ -26,12 +26,6 @@ JukeBox::JukeBox() NotificationManager()->Register(this); } -// FUNCTION: LEGO1 0x1005d6e0 -MxBool JukeBox::VTable0x5c() -{ - return TRUE; -} - // FUNCTION: LEGO1 0x1005d830 JukeBox::~JukeBox() { diff --git a/LEGO1/lego/legoomni/src/worlds/police.cpp b/LEGO1/lego/legoomni/src/worlds/police.cpp index 7b3533d8..0a031509 100644 --- a/LEGO1/lego/legoomni/src/worlds/police.cpp +++ b/LEGO1/lego/legoomni/src/worlds/police.cpp @@ -26,12 +26,6 @@ Police::Police() NotificationManager()->Register(this); } -// FUNCTION: LEGO1 0x1005e1d0 -MxBool Police::VTable0x5c() -{ - return TRUE; -} - // FUNCTION: LEGO1 0x1005e320 Police::~Police() {