Merge remote-tracking branch 'origin/master' into build-mingw64

isledecomp · Jun 25, 2024 · 1e1cba7 · 1e1cba7
2 parents 9dd761a + 492954f
commit 1e1cba7
Show file tree

Hide file tree

Showing 89 changed files with 3,194 additions and 519 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -371,6 +371,7 @@ add_library(lego1 SHARED
   LEGO1/lego/legoomni/src/common/legoobjectfactory.cpp
   LEGO1/lego/legoomni/src/common/legophoneme.cpp
   LEGO1/lego/legoomni/src/common/legoplantmanager.cpp
+  LEGO1/lego/legoomni/src/common/legoplants.cpp
   LEGO1/lego/legoomni/src/common/legostate.cpp
   LEGO1/lego/legoomni/src/common/legotextureinfo.cpp
   LEGO1/lego/legoomni/src/common/legoutils.cpp

diff --git a/LEGO1/lego/legoomni/include/ambulance.h b/LEGO1/lego/legoomni/include/ambulance.h
@@ -122,15 +122,15 @@ class Ambulance : public IslePathActor {
 		return !strcmp(p_name, Ambulance::ClassName()) || IslePathActor::IsA(p_name);
 	}
 
-	MxResult Create(MxDSAction& p_dsAction) override;                      // vtable+0x18
-	void Destroy(MxBool p_fromDestructor) override;                        // vtable+0x1c
-	void VTable0x70(float p_time) override;                                // vtable+0x70
-	MxLong HandleClick() override;                                         // vtable+0xcc
-	MxLong HandleControl(LegoControlManagerEvent& p_param) override;       // vtable+0xd4
-	MxLong HandlePathStruct(LegoPathStructEvent& p_param) override;        // vtable+0xdc
-	void Exit() override;                                                  // vtable+0xe4
-	virtual MxLong HandleButtonDown(LegoControlManagerEvent& p_param);     // vtable+0xf0
-	virtual MxLong HandleEndAction(MxEndActionNotificationParam& p_param); // vtable+0xf4
+	MxResult Create(MxDSAction& p_dsAction) override;                              // vtable+0x18
+	void Destroy(MxBool p_fromDestructor) override;                                // vtable+0x1c
+	void VTable0x70(float p_time) override;                                        // vtable+0x70
+	MxLong HandleClick() override;                                                 // vtable+0xcc
+	MxLong HandleControl(LegoControlManagerNotificationParam& p_param) override;   // vtable+0xd4
+	MxLong HandlePathStruct(LegoPathStructNotificationParam& p_param) override;    // vtable+0xdc
+	void Exit() override;                                                          // vtable+0xe4
+	virtual MxLong HandleButtonDown(LegoControlManagerNotificationParam& p_param); // vtable+0xf0
+	virtual MxLong HandleEndAction(MxEndActionNotificationParam& p_param);         // vtable+0xf4
 
 	void CreateState();
 	void FUN_10036e60();

diff --git a/LEGO1/lego/legoomni/include/bike.h b/LEGO1/lego/legoomni/include/bike.h
@@ -23,12 +23,12 @@ class Bike : public IslePathActor {
 		return !strcmp(p_name, Bike::ClassName()) || IslePathActor::IsA(p_name);
 	}
 
-	MxResult Create(MxDSAction& p_dsAction) override;                // vtable+0x18
-	MxLong HandleClick() override;                                   // vtable+0xcc
-	MxLong HandleControl(LegoControlManagerEvent& p_param) override; // vtable+0xd4
-	void Exit() override;                                            // vtable+0xe4
+	MxResult Create(MxDSAction& p_dsAction) override;                            // vtable+0x18
+	MxLong HandleClick() override;                                               // vtable+0xcc
+	MxLong HandleControl(LegoControlManagerNotificationParam& p_param) override; // vtable+0xd4
+	void Exit() override;                                                        // vtable+0xe4
 
-	void FUN_10076b60();
+	void ActivateSceneActions();
 
 	// SYNTHETIC: LEGO1 0x10076880
 	// Bike::`scalar deleting destructor'

diff --git a/LEGO1/lego/legoomni/include/carrace.h b/LEGO1/lego/legoomni/include/carrace.h
@@ -44,13 +44,13 @@ class CarRace : public LegoRace {
 		return !strcmp(p_name, CarRace::ClassName()) || LegoRace::IsA(p_name);
 	}
 
-	MxResult Create(MxDSAction& p_dsAction) override;               // vtable+0x18
-	void ReadyWorld() override;                                     // vtable+0x50
-	MxBool Escape() override;                                       // vtable+0x64
-	MxLong HandleClick(LegoEventNotificationParam&) override;       // vtable+0x6c
-	MxLong HandlePathStruct(LegoPathStructEvent&) override;         // vtable+0x70
-	MxLong HandleEndAction(MxEndActionNotificationParam&) override; // vtable+0x74
-	MxLong HandleType0Notification(MxNotificationParam&) override;  // vtable+0x78
+	MxResult Create(MxDSAction& p_dsAction) override;                   // vtable+0x18
+	void ReadyWorld() override;                                         // vtable+0x50
+	MxBool Escape() override;                                           // vtable+0x64
+	MxLong HandleClick(LegoEventNotificationParam&) override;           // vtable+0x6c
+	MxLong HandlePathStruct(LegoPathStructNotificationParam&) override; // vtable+0x70
+	MxLong HandleEndAction(MxEndActionNotificationParam&) override;     // vtable+0x74
+	MxLong HandleType0Notification(MxNotificationParam&) override;      // vtable+0x78
 
 	// SYNTHETIC: LEGO1 0x10016c70
 	// CarRace::`scalar deleting destructor'

diff --git a/LEGO1/lego/legoomni/include/dunebuggy.h b/LEGO1/lego/legoomni/include/dunebuggy.h
@@ -23,12 +23,12 @@ class DuneBuggy : public IslePathActor {
 		return !strcmp(p_name, DuneBuggy::ClassName()) || IslePathActor::IsA(p_name);
 	}
 
-	MxResult Create(MxDSAction& p_dsAction) override;                // vtable+0x18
-	void VTable0x70(float p_float) override;                         // vtable+0x70
-	MxLong HandleClick() override;                                   // vtable+0xcc
-	MxLong HandleControl(LegoControlManagerEvent& p_param) override; // vtable+0xd4
-	MxLong HandlePathStruct(LegoPathStructEvent& p_param) override;  // vtable+0xdc
-	void Exit() override;                                            // vtable+0xe4
+	MxResult Create(MxDSAction& p_dsAction) override;                            // vtable+0x18
+	void VTable0x70(float p_float) override;                                     // vtable+0x70
+	MxLong HandleClick() override;                                               // vtable+0xcc
+	MxLong HandleControl(LegoControlManagerNotificationParam& p_param) override; // vtable+0xd4
+	MxLong HandlePathStruct(LegoPathStructNotificationParam& p_param) override;  // vtable+0xdc
+	void Exit() override;                                                        // vtable+0xe4
 
 	void FUN_10068350();
 

diff --git a/LEGO1/lego/legoomni/include/elevatorbottom.h b/LEGO1/lego/legoomni/include/elevatorbottom.h
@@ -5,7 +5,7 @@
 #include "legogamestate.h"
 #include "legoworld.h"
 
-class LegoControlManagerEvent;
+class LegoControlManagerNotificationParam;
 
 // VTABLE: LEGO1 0x100d5f20
 // SIZE 0xfc
@@ -44,7 +44,7 @@ class ElevatorBottom : public LegoWorld {
 private:
 	LegoGameState::Area m_destLocation; // 0xf8
 
-	MxLong HandleControl(LegoControlManagerEvent& p_param);
+	MxLong HandleControl(LegoControlManagerNotificationParam& p_param);
 };
 
 #endif // ELEVATORBOTTOM_H
diff --git a/LEGO1/lego/legoomni/include/gasstation.h b/LEGO1/lego/legoomni/include/gasstation.h
@@ -75,12 +75,12 @@ class GasStation : public LegoWorld {
 		return !strcmp(p_name, GasStation::ClassName()) || LegoWorld::IsA(p_name);
 	}
 
-	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
-	virtual MxLong HandleControl(LegoControlManagerEvent& p_param); // vtable+0x6c
+	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
+	virtual MxLong HandleControl(LegoControlManagerNotificationParam& p_param); // vtable+0x6c
 
 	inline void PlayAction(MxU32 p_objectId);
 
@@ -90,7 +90,7 @@ class GasStation : public LegoWorld {
 private:
 	MxLong HandleEndAction(MxEndActionNotificationParam& p_param);
 	MxLong HandleKeyPress(MxS8 p_key);
-	MxLong HandleButtonDown(LegoControlManagerEvent& p_param);
+	MxLong HandleButtonDown(LegoControlManagerNotificationParam& p_param);
 
 	MxS16 m_currentActorId;             // 0xf8
 	undefined2 m_unk0xfa;               // 0xfa

diff --git a/LEGO1/lego/legoomni/include/helicopter.h b/LEGO1/lego/legoomni/include/helicopter.h
@@ -65,13 +65,13 @@ class Helicopter : public IslePathActor {
 		return !strcmp(p_name, Helicopter::ClassName()) || IslePathActor::IsA(p_name);
 	}
 
-	MxResult Create(MxDSAction& p_dsAction) override;                     // vtable+0x18
-	void VTable0x70(float p_float) override;                              // vtable+0x70
-	void VTable0x74(Matrix4& p_transform) override;                       // vtable+0x74
-	MxLong HandleClick() override;                                        // vtable+0xcc
-	MxLong HandleControl(LegoControlManagerEvent& p_param) override;      // vtable+0xd4
-	MxLong HandleEndAnim(LegoEndAnimNotificationParam& p_param) override; // vtable+0xd8
-	void Exit() override;                                                 // vtable+0xe4
+	MxResult Create(MxDSAction& p_dsAction) override;                            // vtable+0x18
+	void VTable0x70(float p_float) override;                                     // vtable+0x70
+	void VTable0x74(Matrix4& p_transform) override;                              // vtable+0x74
+	MxLong HandleClick() override;                                               // vtable+0xcc
+	MxLong HandleControl(LegoControlManagerNotificationParam& p_param) override; // vtable+0xd4
+	MxLong HandleEndAnim(LegoEndAnimNotificationParam& p_param) override;        // vtable+0xd8
+	void Exit() override;                                                        // vtable+0xe4
 
 	// SYNTHETIC: LEGO1 0x10003210
 	// Helicopter::`scalar deleting destructor'

diff --git a/LEGO1/lego/legoomni/include/hospital.h b/LEGO1/lego/legoomni/include/hospital.h
@@ -7,7 +7,7 @@
 #include "legostate.h"
 #include "legoworld.h"
 
-class LegoControlManagerEvent;
+class LegoControlManagerNotificationParam;
 class MxEndActionNotificationParam;
 class MxStillPresenter;
 
@@ -89,8 +89,8 @@ class Hospital : public LegoWorld {
 private:
 	MxLong HandleKeyPress(MxS8 p_key);
 	MxLong HandleEndAction(MxEndActionNotificationParam& p_param);
-	MxLong HandleButtonDown(LegoControlManagerEvent& p_param);
-	MxBool HandleControl(LegoControlManagerEvent& p_param);
+	MxLong HandleButtonDown(LegoControlManagerNotificationParam& p_param);
+	MxBool HandleControl(LegoControlManagerNotificationParam& p_param);
 
 	MxS16 m_currentActorId;                 // 0xf8
 	LegoGameState::Area m_destLocation;     // 0xfc

diff --git a/LEGO1/lego/legoomni/include/infocenter.h b/LEGO1/lego/legoomni/include/infocenter.h
@@ -10,7 +10,7 @@
 
 class MxNotificationParam;
 class MxStillPresenter;
-class LegoControlManagerEvent;
+class LegoControlManagerNotificationParam;
 
 // VTABLE: LEGO1 0x100d93a8
 // SIZE 0x94
@@ -129,7 +129,7 @@ class Infocenter : public LegoWorld {
 	MxLong HandleKeyPress(MxS8 p_key);
 	MxU8 HandleMouseMove(MxS32 p_x, MxS32 p_y);
 	MxU8 HandleButtonUp(MxS32 p_x, MxS32 p_y);
-	MxU8 HandleControl(LegoControlManagerEvent& p_param);
+	MxU8 HandleControl(LegoControlManagerNotificationParam& p_param);
 	MxLong HandleEndAction(MxEndActionNotificationParam& p_param);
 	MxLong HandleNotification0(MxNotificationParam& p_param);
 

diff --git a/LEGO1/lego/legoomni/include/infocenterdoor.h b/LEGO1/lego/legoomni/include/infocenterdoor.h
@@ -4,7 +4,7 @@
 #include "legogamestate.h"
 #include "legoworld.h"
 
-class LegoControlManagerEvent;
+class LegoControlManagerNotificationParam;
 
 // VTABLE: LEGO1 0x100d72d8
 // SIZE 0xfc
@@ -43,7 +43,7 @@ class InfocenterDoor : public LegoWorld {
 private:
 	LegoGameState::Area m_destLocation; // 0xf8
 
-	MxLong HandleControl(LegoControlManagerEvent& p_param);
+	MxLong HandleControl(LegoControlManagerNotificationParam& p_param);
 };
 
 #endif // INFOCENTERDOOR_H
diff --git a/LEGO1/lego/legoomni/include/isle.h b/LEGO1/lego/legoomni/include/isle.h
@@ -15,7 +15,7 @@ class Jetski;
 class JukeBoxEntity;
 class LegoNamedTexture;
 class Motocycle;
-class LegoPathStructEvent;
+class LegoPathStructNotificationParam;
 class Pizza;
 class Pizzeria;
 class RaceCar;
@@ -198,8 +198,8 @@ class Isle : public LegoWorld {
 
 protected:
 	MxLong HandleEndAction(MxEndActionNotificationParam& p_param);
-	MxLong HandleControl(LegoControlManagerEvent& p_param);
-	MxLong HandlePathStruct(LegoPathStructEvent& p_param);
+	MxLong HandleControl(LegoControlManagerNotificationParam& p_param);
+	MxLong HandlePathStruct(LegoPathStructNotificationParam& p_param);
 	MxLong HandleTransitionEnd();
 	void HandleElevatorEndAction();
 	void UpdateGlobe();

diff --git a/LEGO1/lego/legoomni/include/isleactor.h b/LEGO1/lego/legoomni/include/isleactor.h
@@ -3,6 +3,8 @@
 
 #include "legoactor.h"
 
+class LegoControlManagerNotificationParam;
+class LegoPathStructNotificationParam;
 class LegoWorld;
 class MxEndActionNotificationParam;
 class MxNotificationParam;
@@ -29,25 +31,25 @@ class IsleActor : public LegoActor {
 	MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
 
 	// FUNCTION: LEGO1 0x1000e5f0
-	virtual undefined4 HandleClick() { return 0; } // vtable+0x68
+	virtual MxLong HandleClick() { return 0; } // vtable+0x68
 
 	// FUNCTION: LEGO1 0x1000e600
-	virtual undefined4 VTable0x6c() { return 0; } // vtable+0x6c
+	virtual MxLong VTable0x6c() { return 0; } // vtable+0x6c
 
 	// FUNCTION: LEGO1 0x1000e610
-	virtual undefined4 VTable0x70() { return 0; } // vtable+0x70
+	virtual MxLong HandleEndAnim() { return 0; } // vtable+0x70
 
 	// FUNCTION: LEGO1 0x1000e620
-	virtual undefined4 HandleEndAction(MxEndActionNotificationParam&) { return 0; } // vtable+0x74
+	virtual MxLong HandleEndAction(MxEndActionNotificationParam&) { return 0; } // vtable+0x74
 
 	// FUNCTION: LEGO1 0x1000e630
-	virtual undefined4 HandleButtonDown(MxNotificationParam&) { return 0; } // vtable+0x78
+	virtual MxLong HandleButtonDown(LegoControlManagerNotificationParam&) { return 0; } // vtable+0x78
 
 	// FUNCTION: LEGO1 0x1000e640
-	virtual undefined4 HandleButtonUp(MxNotificationParam&) { return 0; } // vtable+0x7c
+	virtual MxLong HandleButtonUp(LegoControlManagerNotificationParam&) { return 0; } // vtable+0x7c
 
 	// FUNCTION: LEGO1 0x1000e650
-	virtual undefined4 VTable0x80(MxParam&) { return 0; } // vtable+0x80
+	virtual MxLong HandlePathStruct(LegoPathStructNotificationParam&) { return 0; } // vtable+0x80
 
 protected:
 	LegoWorld* m_world; // 0x78

diff --git a/LEGO1/lego/legoomni/include/islepathactor.h b/LEGO1/lego/legoomni/include/islepathactor.h
@@ -6,10 +6,10 @@
 #include "mxtypes.h"
 #include "roi/legoroi.h"
 
-class LegoControlManagerEvent;
+class LegoControlManagerNotificationParam;
 class LegoEndAnimNotificationParam;
 class LegoWorld;
-class LegoPathStructEvent;
+class LegoPathStructNotificationParam;
 
 // VTABLE: LEGO1 0x100d4398
 // SIZE 0x160
@@ -113,13 +113,13 @@ class IslePathActor : public LegoPathActor {
 	virtual MxLong HandleNotification0() { return 0; } // vtable+0xd0
 
 	// FUNCTION: LEGO1 0x10002e80
-	virtual MxLong HandleControl(LegoControlManagerEvent&) { return 0; } // vtable+0xd4
+	virtual MxLong HandleControl(LegoControlManagerNotificationParam&) { return 0; } // vtable+0xd4
 
 	// FUNCTION: LEGO1 0x10002e90
 	virtual MxLong HandleEndAnim(LegoEndAnimNotificationParam&) { return 0; } // vtable+0xd8
 
 	// FUNCTION: LEGO1 0x10002e00
-	virtual MxLong HandlePathStruct(LegoPathStructEvent&) { return 0; } // vtable+0xdc
+	virtual MxLong HandlePathStruct(LegoPathStructNotificationParam&) { return 0; } // vtable+0xdc
 
 	virtual void Enter();                                                                        // vtable+0xe0
 	virtual void Exit();                                                                         // vtable+0xe4

diff --git a/LEGO1/lego/legoomni/include/jetski.h b/LEGO1/lego/legoomni/include/jetski.h
@@ -4,7 +4,7 @@
 #include "decomp.h"
 #include "islepathactor.h"
 
-class LegoControlManagerEvent;
+class LegoControlManagerNotificationParam;
 
 // VTABLE: LEGO1 0x100d9ec8
 // SIZE 0x164
@@ -25,11 +25,11 @@ class Jetski : public IslePathActor {
 		return !strcmp(p_name, Jetski::ClassName()) || IslePathActor::IsA(p_name);
 	}
 
-	MxResult Create(MxDSAction& p_dsAction) override;        // vtable+0x18
-	void VTable0x70(float p_float) override;                 // vtable+0x70
-	MxLong HandleClick() override;                           // vtable+0xcc
-	MxLong HandleControl(LegoControlManagerEvent&) override; // vtable+0xd4
-	void Exit() override;                                    // vtable+0xe4
+	MxResult Create(MxDSAction& p_dsAction) override;                    // vtable+0x18
+	void VTable0x70(float p_float) override;                             // vtable+0x70
+	MxLong HandleClick() override;                                       // vtable+0xcc
+	MxLong HandleControl(LegoControlManagerNotificationParam&) override; // vtable+0xd4
+	void Exit() override;                                                // vtable+0xe4
 
 	void FUN_1007e990();
 

diff --git a/LEGO1/lego/legoomni/include/jetskirace.h b/LEGO1/lego/legoomni/include/jetskirace.h
@@ -48,12 +48,12 @@ class JetskiRace : public LegoRace {
 		return !strcmp(p_name, JetskiRace::ClassName()) || LegoRace::IsA(p_name);
 	}
 
-	MxResult Create(MxDSAction& p_dsAction) override;               // vtable+0x18
-	void ReadyWorld() override;                                     // vtable+0x50
-	MxBool Escape() override;                                       // vtable+0x64
-	MxLong HandleClick(LegoEventNotificationParam&) override;       // vtable+0x6c
-	MxLong HandlePathStruct(LegoPathStructEvent&) override;         // vtable+0x70
-	MxLong HandleEndAction(MxEndActionNotificationParam&) override; // vtable+0x74
+	MxResult Create(MxDSAction& p_dsAction) override;                   // vtable+0x18
+	void ReadyWorld() override;                                         // vtable+0x50
+	MxBool Escape() override;                                           // vtable+0x64
+	MxLong HandleClick(LegoEventNotificationParam&) override;           // vtable+0x6c
+	MxLong HandlePathStruct(LegoPathStructNotificationParam&) override; // vtable+0x70
+	MxLong HandleEndAction(MxEndActionNotificationParam&) override;     // vtable+0x74
 };
 
 // SYNTHETIC: LEGO1 0x1000f530

diff --git a/LEGO1/lego/legoomni/include/jukebox.h b/LEGO1/lego/legoomni/include/jukebox.h
@@ -6,7 +6,7 @@
 #include "legostate.h"
 #include "legoworld.h"
 
-class LegoControlManagerEvent;
+class LegoControlManagerNotificationParam;
 
 // VTABLE: LEGO1 0x100d4a90
 // SIZE 0x10
@@ -79,7 +79,7 @@ class JukeBox : public LegoWorld {
 	// JukeBox::`scalar deleting destructor'
 
 private:
-	MxBool HandleControl(LegoControlManagerEvent& p_param);
+	MxBool HandleControl(LegoControlManagerNotificationParam& p_param);
 
 	LegoGameState::Area m_destLocation; // 0xf8
 	JukeBoxState* m_state;              // 0xfc