From 0ff75bebecec703a093ddc15d1577ba23567a2d1 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Mon, 20 Jan 2025 17:13:02 -0700
Subject: [PATCH] More order

---
 CMakeLists.txt                              | 6 +++---
 LEGO1/lego/legoomni/include/act3.h          | 4 +++-
 LEGO1/lego/legoomni/include/hospital.h      | 4 +++-
 LEGO1/lego/legoomni/src/worlds/act3.cpp     | 6 ------
 LEGO1/lego/legoomni/src/worlds/hospital.cpp | 6 ------
 5 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 85ddbdd3..161f2798 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -380,13 +380,13 @@ function(add_lego_libraries NAME)
     LEGO1/lego/legoomni/src/video/legohideanimpresenter.cpp
     LEGO1/lego/legoomni/src/worlds/infocenter.cpp
     LEGO1/lego/legoomni/src/race/raceskel.cpp
+    LEGO1/lego/legoomni/src/worlds/act3.cpp
+    LEGO1/lego/legoomni/src/common/mxcompositemediapresenter.cpp
+    LEGO1/lego/legoomni/src/worlds/hospital.cpp
 
     LEGO1/lego/legoomni/src/entity/legojetskiraceactor.cpp
     LEGO1/lego/legoomni/src/build/legocarbuildpresenter.cpp
-    LEGO1/lego/legoomni/src/worlds/act3.cpp
     LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp
-    LEGO1/lego/legoomni/src/common/mxcompositemediapresenter.cpp
-    LEGO1/lego/legoomni/src/worlds/hospital.cpp
     LEGO1/lego/legoomni/src/actors/bike.cpp
     LEGO1/lego/legoomni/src/entity/legoactorpresenter.cpp
     LEGO1/lego/legoomni/src/worlds/registrationbook.cpp
diff --git a/LEGO1/lego/legoomni/include/act3.h b/LEGO1/lego/legoomni/include/act3.h
index 174d74a7..8b31ea73 100644
--- a/LEGO1/lego/legoomni/include/act3.h
+++ b/LEGO1/lego/legoomni/include/act3.h
@@ -92,6 +92,9 @@ class Act3 : public LegoWorld {
 	MxLong Notify(MxParam& p_param) override; // vtable+0x04
 	MxResult Tickle() override;               // vtable+0x08
 
+	// FUNCTION: LEGO1 0x10072500
+	MxBool VTable0x5c() override { return TRUE; } // vtable+0x5c
+
 	// FUNCTION: LEGO1 0x10072510
 	// FUNCTION: BETA10 0x10017550
 	const char* ClassName() const override // vtable+0x0c
@@ -109,7 +112,6 @@ class Act3 : public LegoWorld {
 	MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
 	void Destroy(MxBool p_fromDestructor) override;   // vtable+0x1c
 	void ReadyWorld() override;                       // vtable+0x50
-	MxBool VTable0x5c() override;                     // vtable+0x5c
 	void VTable0x60() override;                       // vtable+0x60
 	MxBool Escape() override;                         // vtable+0x64
 	void Enable(MxBool p_enable) override;            // vtable+0x68
diff --git a/LEGO1/lego/legoomni/include/hospital.h b/LEGO1/lego/legoomni/include/hospital.h
index ef16252c..a8d719be 100644
--- a/LEGO1/lego/legoomni/include/hospital.h
+++ b/LEGO1/lego/legoomni/include/hospital.h
@@ -65,6 +65,9 @@ class Hospital : public LegoWorld {
 	MxLong Notify(MxParam& p_param) override; // vtable+0x04
 	MxResult Tickle() override;               // vtable+0x08
 
+	// FUNCTION: LEGO1 0x100746a0
+	MxBool VTable0x5c() override { return TRUE; } // vtable+0x5c
+
 	// FUNCTION: LEGO1 0x100746b0
 	// FUNCTION: BETA10 0x1002e1a0
 	const char* ClassName() const override // vtable+0x0c
@@ -81,7 +84,6 @@ class Hospital : 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/worlds/act3.cpp b/LEGO1/lego/legoomni/src/worlds/act3.cpp
index 0043e4b6..af9619ac 100644
--- a/LEGO1/lego/legoomni/src/worlds/act3.cpp
+++ b/LEGO1/lego/legoomni/src/worlds/act3.cpp
@@ -241,12 +241,6 @@ Act3::Act3()
 	NotificationManager()->Register(this);
 }
 
-// FUNCTION: LEGO1 0x10072500
-MxBool Act3::VTable0x5c()
-{
-	return TRUE;
-}
-
 // FUNCTION: LEGO1 0x100726a0
 // FUNCTION: BETA10 0x100155da
 Act3::~Act3()
diff --git a/LEGO1/lego/legoomni/src/worlds/hospital.cpp b/LEGO1/lego/legoomni/src/worlds/hospital.cpp
index 303d7b90..b10526ca 100644
--- a/LEGO1/lego/legoomni/src/worlds/hospital.cpp
+++ b/LEGO1/lego/legoomni/src/worlds/hospital.cpp
@@ -50,12 +50,6 @@ Hospital::Hospital()
 	NotificationManager()->Register(this);
 }
 
-// FUNCTION: LEGO1 0x100746a0
-MxBool Hospital::VTable0x5c()
-{
-	return TRUE;
-}
-
 // FUNCTION: LEGO1 0x100747f0
 Hospital::~Hospital()
 {