From a0c5bfc400acb9f9cf70a5b775df30687a418f1e Mon Sep 17 00:00:00 2001 From: Misha <106913236+MishaProductions@users.noreply.github.com> Date: Fri, 12 Jan 2024 17:17:30 -0500 Subject: [PATCH] Rename functions --- LEGO1/lego/legoomni/include/infocenter.h | 2 +- LEGO1/lego/legoomni/include/isle.h | 2 +- LEGO1/lego/legoomni/include/legoanimationmanager.h | 2 +- LEGO1/lego/legoomni/include/legobuildingmanager.h | 2 +- LEGO1/lego/legoomni/include/legoplantmanager.h | 2 +- LEGO1/lego/legoomni/include/legoworld.h | 2 +- LEGO1/lego/legoomni/include/score.h | 2 +- LEGO1/lego/legoomni/src/build/legobuildingmanager.cpp | 2 +- LEGO1/lego/legoomni/src/common/legoplantmanager.cpp | 2 +- LEGO1/lego/legoomni/src/entity/legoworld.cpp | 4 ++-- LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp | 6 +++--- LEGO1/lego/legoomni/src/infocenter/infocenter.cpp | 2 +- LEGO1/lego/legoomni/src/infocenter/score.cpp | 4 ++-- LEGO1/lego/legoomni/src/isle/isle.cpp | 2 +- LEGO1/lego/legoomni/src/video/legoanimationmanager.cpp | 2 +- 15 files changed, 19 insertions(+), 19 deletions(-) diff --git a/LEGO1/lego/legoomni/include/infocenter.h b/LEGO1/lego/legoomni/include/infocenter.h index bb8d7ff7..22234983 100644 --- a/LEGO1/lego/legoomni/include/infocenter.h +++ b/LEGO1/lego/legoomni/include/infocenter.h @@ -27,7 +27,7 @@ class Infocenter : public LegoWorld { } virtual MxResult Create(MxDSObject& p_dsObject) override; // vtable+0x18 - virtual void OnStartWorld() override; // vtable+0x50 + 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 diff --git a/LEGO1/lego/legoomni/include/isle.h b/LEGO1/lego/legoomni/include/isle.h index 4031a5f6..42990eee 100644 --- a/LEGO1/lego/legoomni/include/isle.h +++ b/LEGO1/lego/legoomni/include/isle.h @@ -41,7 +41,7 @@ class Isle : public LegoWorld { } virtual MxResult Create(MxDSObject& p_dsObject) override; // vtable+0x18 - virtual void OnStartWorld() override; // vtable+50 + virtual void VTable0x50() override; // vtable+50 virtual void VTable0x58(MxCore* p_object) override; // vtable+58 // FUNCTION: LEGO1 0x10030900 virtual MxBool VTable0x5c() override { return TRUE; } // vtable+5c diff --git a/LEGO1/lego/legoomni/include/legoanimationmanager.h b/LEGO1/lego/legoomni/include/legoanimationmanager.h index e8feb299..5c13947f 100644 --- a/LEGO1/lego/legoomni/include/legoanimationmanager.h +++ b/LEGO1/lego/legoomni/include/legoanimationmanager.h @@ -28,8 +28,8 @@ class LegoAnimationManager : public MxCore { } void FUN_1005f6d0(MxBool); + void FUN_1005f720(undefined4); void FUN_10064670(MxBool); - void InitForWorld(undefined4); __declspec(dllexport) static void configureLegoAnimationManager(MxS32 p_legoAnimationManagerConfig); diff --git a/LEGO1/lego/legoomni/include/legobuildingmanager.h b/LEGO1/lego/legoomni/include/legobuildingmanager.h index b472afff..03fb2eeb 100644 --- a/LEGO1/lego/legoomni/include/legobuildingmanager.h +++ b/LEGO1/lego/legoomni/include/legobuildingmanager.h @@ -19,7 +19,7 @@ class LegoBuildingManager : public MxCore { __declspec(dllexport) static void configureLegoBuildingManager(MxS32); - void OnWorldCreated(); + void FUN_1002fa00(); private: void Init(); diff --git a/LEGO1/lego/legoomni/include/legoplantmanager.h b/LEGO1/lego/legoomni/include/legoplantmanager.h index 8aa9ce50..e509e17e 100644 --- a/LEGO1/lego/legoomni/include/legoplantmanager.h +++ b/LEGO1/lego/legoomni/include/legoplantmanager.h @@ -20,7 +20,7 @@ class LegoPlantManager : public MxCore { return "LegoPlantManager"; } - void InitForWorld(undefined4 p_world); + void FUN_10026360(undefined4 p_world); private: void Init(); diff --git a/LEGO1/lego/legoomni/include/legoworld.h b/LEGO1/lego/legoomni/include/legoworld.h index 1c2ba58b..34a9ee24 100644 --- a/LEGO1/lego/legoomni/include/legoworld.h +++ b/LEGO1/lego/legoomni/include/legoworld.h @@ -33,7 +33,7 @@ class LegoWorld : public LegoEntity { return !strcmp(p_name, LegoWorld::ClassName()) || LegoEntity::IsA(p_name); } - virtual void OnStartWorld(); // vtable+50 + virtual void VTable0x50(); // vtable+50 virtual void VTable0x54(); // vtable+54 virtual void VTable0x58(MxCore* p_object); // vtable+58 virtual MxBool VTable0x5c(); // vtable+5c diff --git a/LEGO1/lego/legoomni/include/score.h b/LEGO1/lego/legoomni/include/score.h index 1f0e987d..7075de58 100644 --- a/LEGO1/lego/legoomni/include/score.h +++ b/LEGO1/lego/legoomni/include/score.h @@ -32,7 +32,7 @@ class Score : public LegoWorld { // Score::`scalar deleting destructor' virtual MxResult Create(MxDSObject& p_dsObject) override; // vtable+18 - virtual void OnStartWorld() override; // vtable+50 + virtual void VTable0x50() override; // vtable+50 virtual MxBool VTable0x5c() override; // vtable+5c virtual MxBool VTable0x64() override; // vtable+64 virtual void VTable0x68(MxBool p_add) override; // vtable+68 diff --git a/LEGO1/lego/legoomni/src/build/legobuildingmanager.cpp b/LEGO1/lego/legoomni/src/build/legobuildingmanager.cpp index 75bc4c4c..3e6c4d7b 100644 --- a/LEGO1/lego/legoomni/src/build/legobuildingmanager.cpp +++ b/LEGO1/lego/legoomni/src/build/legobuildingmanager.cpp @@ -28,7 +28,7 @@ void LegoBuildingManager::Init() } // STUB: LEGO1 0x1002fa00 -void LegoBuildingManager::OnWorldCreated() +void LegoBuildingManager::FUN_1002fa00() { // TODO } diff --git a/LEGO1/lego/legoomni/src/common/legoplantmanager.cpp b/LEGO1/lego/legoomni/src/common/legoplantmanager.cpp index 0388dc41..193f5c8a 100644 --- a/LEGO1/lego/legoomni/src/common/legoplantmanager.cpp +++ b/LEGO1/lego/legoomni/src/common/legoplantmanager.cpp @@ -19,7 +19,7 @@ void LegoPlantManager::Init() } // STUB: LEGO1 0x10026360 -void LegoPlantManager::InitForWorld(undefined4 p_world) +void LegoPlantManager::FUN_10026360(undefined4 p_world) { // TODO } diff --git a/LEGO1/lego/legoomni/src/entity/legoworld.cpp b/LEGO1/lego/legoomni/src/entity/legoworld.cpp index f1bef74b..b04543df 100644 --- a/LEGO1/lego/legoomni/src/entity/legoworld.cpp +++ b/LEGO1/lego/legoomni/src/entity/legoworld.cpp @@ -106,7 +106,7 @@ MxResult LegoWorld::Tickle() case 0: m_worldStarted = TRUE; SetAppCursor(0); - OnStartWorld(); + VTable0x50(); return TRUE; case 2: if (FUN_100220e0() == 1) @@ -125,7 +125,7 @@ undefined LegoWorld::FUN_100220e0() } // FUNCTION: LEGO1 0x10022340 -void LegoWorld::OnStartWorld() +void LegoWorld::VTable0x50() { TickleManager()->UnregisterClient(this); } diff --git a/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp b/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp index 8e2e67de..5be1baa8 100644 --- a/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp +++ b/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp @@ -37,9 +37,9 @@ LegoWorldPresenter::~LegoWorldPresenter() MxBool result = FALSE; if (m_objectBackend) { undefined4 world = ((LegoWorld*) m_objectBackend)->GetUnknown0xec(); - PlantManager()->InitForWorld(world); - AnimationManager()->InitForWorld(world); - BuildingManager()->OnWorldCreated(); + PlantManager()->FUN_10026360(world); + AnimationManager()->FUN_1005f720(world); + BuildingManager()->FUN_1002fa00(); result = ((LegoWorld*) m_objectBackend)->VTable0x5c(); } diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp index a695b8ec..47d89ea5 100644 --- a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp +++ b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp @@ -26,7 +26,7 @@ MxLong Infocenter::Notify(MxParam& p_param) } // STUB: LEGO1 0x1006f4e0 -void Infocenter::OnStartWorld() +void Infocenter::VTable0x50() { // TODO } diff --git a/LEGO1/lego/legoomni/src/infocenter/score.cpp b/LEGO1/lego/legoomni/src/infocenter/score.cpp index e05379df..5e9ca19c 100644 --- a/LEGO1/lego/legoomni/src/infocenter/score.cpp +++ b/LEGO1/lego/legoomni/src/infocenter/score.cpp @@ -128,9 +128,9 @@ MxLong Score::FUN_10001510(MxEndActionNotificationParam& p_param) } // FUNCTION: LEGO1 0x10001580 -void Score::OnStartWorld() +void Score::VTable0x50() { - LegoWorld::OnStartWorld(); + LegoWorld::VTable0x50(); MxDSAction action; action.SetObjectId(0x1f4); diff --git a/LEGO1/lego/legoomni/src/isle/isle.cpp b/LEGO1/lego/legoomni/src/isle/isle.cpp index 912cbefa..f11497e6 100644 --- a/LEGO1/lego/legoomni/src/isle/isle.cpp +++ b/LEGO1/lego/legoomni/src/isle/isle.cpp @@ -153,7 +153,7 @@ MxLong Isle::StopAction(MxParam& p_param) } // STUB: LEGO1 0x10030fc0 -void Isle::OnStartWorld() +void Isle::VTable0x50() { // TODO } diff --git a/LEGO1/lego/legoomni/src/video/legoanimationmanager.cpp b/LEGO1/lego/legoomni/src/video/legoanimationmanager.cpp index 0cc21ada..578cf55d 100644 --- a/LEGO1/lego/legoomni/src/video/legoanimationmanager.cpp +++ b/LEGO1/lego/legoomni/src/video/legoanimationmanager.cpp @@ -34,7 +34,7 @@ void LegoAnimationManager::FUN_1005f6d0(MxBool) } // STUB: LEGO1 0x1005f720 -void LegoAnimationManager::InitForWorld(undefined4) +void LegoAnimationManager::FUN_1005f720(undefined4) { // TODO }