From 76c0ae0ed791badbbabee4f09c69cbe628559c4e Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Sun, 5 Jan 2025 12:46:00 -0700 Subject: [PATCH] Order `Act2Actor` --- CMakeLists.txt | 2 +- LEGO1/lego/legoomni/include/act2actor.h | 24 ++++++++++++++------ LEGO1/lego/legoomni/src/actors/act2actor.cpp | 10 -------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 42121b39b4..4f995f33f4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -309,8 +309,8 @@ function(add_lego_libraries NAME) LEGO1/lego/legoomni/src/actors/pizzeria.cpp LEGO1/lego/legoomni/src/worlds/elevatorbottom.cpp LEGO1/lego/legoomni/src/audio/legoloadcachesoundpresenter.cpp - LEGO1/lego/legoomni/src/actors/act2actor.cpp LEGO1/lego/legoomni/src/actors/act2genactor.cpp + LEGO1/lego/legoomni/src/actors/act2actor.cpp LEGO1/lego/legoomni/src/actors/islepathactor.cpp LEGO1/lego/legoomni/src/paths/legopathstruct.cpp LEGO1/lego/legoomni/src/paths/legoanimactor.cpp diff --git a/LEGO1/lego/legoomni/include/act2actor.h b/LEGO1/lego/legoomni/include/act2actor.h index 68b8f59d52..324cf4b331 100644 --- a/LEGO1/lego/legoomni/include/act2actor.h +++ b/LEGO1/lego/legoomni/include/act2actor.h @@ -19,13 +19,23 @@ class Act2Actor : public LegoAnimActor { Act2Actor(); - void SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2) override; // vtable+0x24 - void SetWorldSpeed(MxFloat p_worldSpeed) override; // vtable+0x30 - MxS32 VTable0x68(Vector3& p_v1, Vector3& p_v2, Vector3& p_v3) override; // vtable+0x68 - void Animate(float p_time) override; // vtable+0x70 - MxResult HitActor(LegoPathActor*, MxBool) override; // vtable+0x94 - MxResult VTable0x9c() override; // vtable+0x9c - MxS32 VTable0xa0() override; // vtable+0xa0 + void SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2) override; // vtable+0x24 + void SetWorldSpeed(MxFloat p_worldSpeed) override; // vtable+0x30 + + // FUNCTION: LEGO1 0x1001a180 + MxS32 VTable0x68(Vector3& p_v1, Vector3& p_v2, Vector3& p_v3) override + { + if (m_unk0x1f) { + return 0; + } + + return LegoAnimActor::VTable0x68(p_v1, p_v2, p_v3); + } // vtable+0x68 + + void Animate(float p_time) override; // vtable+0x70 + MxResult HitActor(LegoPathActor*, MxBool) override; // vtable+0x94 + MxResult VTable0x9c() override; // vtable+0x9c + MxS32 VTable0xa0() override; // vtable+0xa0 void FUN_10018980(); void FUN_10019250(MxFloat p_speed, MxFloat p_param2); diff --git a/LEGO1/lego/legoomni/src/actors/act2actor.cpp b/LEGO1/lego/legoomni/src/actors/act2actor.cpp index 5250612195..a13abf1cf3 100644 --- a/LEGO1/lego/legoomni/src/actors/act2actor.cpp +++ b/LEGO1/lego/legoomni/src/actors/act2actor.cpp @@ -869,13 +869,3 @@ LegoEntity* Act2Actor::FUN_10019b90(MxBool* p_param) return result; } - -// FUNCTION: LEGO1 0x1001a180 -MxS32 Act2Actor::VTable0x68(Vector3& p_v1, Vector3& p_v2, Vector3& p_v3) -{ - if (m_unk0x1f) { - return 0; - } - - return LegoAnimActor::VTable0x68(p_v1, p_v2, p_v3); -}