Order until LegoCarBuildAnimPresenter (#1365)

* Order until `Infocenter` * Order until RaceSkel * More order * Order until `LegoCarBuildAnimPresenter` * Add blank line * Add BETA annotation
2025-10-23 08:24:16 +00:00 · 2025-01-20 17:31:28 -07:00
parent 9480fd9d98
commit 5a7df7f95d
19 changed files with 108 additions and 116 deletions
--- a/LEGO1/lego/legoomni/include/act3.h
+++ b/LEGO1/lego/legoomni/include/act3.h
@@ -92,6 +92,9 @@ public:
 	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 @@ public:
 	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
--- a/LEGO1/lego/legoomni/include/hospital.h
+++ b/LEGO1/lego/legoomni/include/hospital.h
@@ -16,11 +16,6 @@ class MxStillPresenter;
 // SIZE 0x18
 class HospitalState : public LegoState {
 public:
-	// SIZE 0x04
-	struct Unknown0x08 {
-		undefined4 m_unk0x00; // 0x00
-	};
-
 	HospitalState();
 	~HospitalState() override {}

@@ -45,13 +40,13 @@ public:

 	// TODO: Most likely getters/setters are not used according to BETA.

-	Unknown0x08 m_unk0x08; // 0x08
-	MxS16 m_unk0x0c;       // 0x0c
-	MxS16 m_unk0x0e;       // 0x0e
-	MxS16 m_unk0x10;       // 0x10
-	MxS16 m_unk0x12;       // 0x12
-	MxS16 m_unk0x14;       // 0x14
-	MxS16 m_unk0x16;       // 0x16
+	undefined4 m_unk0x08; // 0x08
+	MxS16 m_unk0x0c;      // 0x0c
+	MxS16 m_unk0x0e;      // 0x0e
+	MxS16 m_unk0x10;      // 0x10
+	MxS16 m_unk0x12;      // 0x12
+	MxS16 m_unk0x14;      // 0x14
+	MxS16 m_unk0x16;      // 0x16
 };

 // VTABLE: LEGO1 0x100d9730
@@ -65,6 +60,9 @@ public:
 	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 +79,6 @@ public:

 	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

--- a/LEGO1/lego/legoomni/include/infocenter.h
+++ b/LEGO1/lego/legoomni/include/infocenter.h
@@ -20,6 +20,9 @@ public:
 	InfocenterState();
 	~InfocenterState() override;

+	// FUNCTION: LEGO1 0x10071830
+	MxBool IsSerializable() override { return FALSE; } // vtable+0x14
+
 	// FUNCTION: LEGO1 0x10071840
 	// FUNCTION: BETA10 0x10031ee0
 	const char* ClassName() const override // vtable+0x0c
@@ -34,9 +37,6 @@ public:
 		return !strcmp(p_name, InfocenterState::ClassName()) || LegoState::IsA(p_name);
 	}

-	// FUNCTION: LEGO1 0x10071830
-	MxBool IsSerializable() override { return FALSE; } // vtable+0x14
-
 	MxS16 GetMaxNameLength() { return sizeOfArray(m_letters); }
 	MxStillPresenter* GetNameLetter(MxS32 p_index) { return m_letters[p_index]; }
 	void SetNameLetter(MxS32 p_index, MxStillPresenter* p_letter) { m_letters[p_index] = p_letter; }
@@ -66,8 +66,7 @@ public:

 // SIZE 0x18
 struct InfocenterMapEntry {
-	// FUNCTION: LEGO1 0x1006ec80
-	InfocenterMapEntry() {}
+	InfocenterMapEntry();

 	MxStillPresenter* m_destCtl; // 0x00
 	undefined4 m_unk0x04;        // 0x04
--- a/LEGO1/lego/legoomni/include/jukebox.h
+++ b/LEGO1/lego/legoomni/include/jukebox.h
@@ -59,6 +59,9 @@ public:
 	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 @@ public:

 	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

--- a/LEGO1/lego/legoomni/include/legocarbuildpresenter.h
+++ b/LEGO1/lego/legoomni/include/legocarbuildpresenter.h
@@ -44,6 +44,9 @@ public:
 		return "LegoCarBuildAnimPresenter";
 	}

+	// FUNCTION: LEGO1 0x10078500
+	void RepeatingTickle() override {} // vtable+0x24
+
 	// FUNCTION: LEGO1 0x10078510
 	// FUNCTION: BETA10 0x10073260
 	const char* ClassName() const override // vtable+0x0c
@@ -59,10 +62,11 @@ public:

 	void ReadyTickle() override;     // vtable+0x18
 	void StreamingTickle() override; // vtable+0x20
-	void RepeatingTickle() override; // vtable+0x24
 	void EndAction() override;       // vtable+0x40
 	void PutFrame() override;        // vtable+0x6c

+	virtual MxResult Serialize(LegoStorage* p_storage);
+
 	void FUN_10079050(MxS16 p_index);
 	void SwapNodesByName(LegoChar* p_param1, LegoChar* p_param2);
 	void FUN_10079160();
--- a/LEGO1/lego/legoomni/include/legohideanimpresenter.h
+++ b/LEGO1/lego/legoomni/include/legohideanimpresenter.h
@@ -25,6 +25,12 @@ public:
 	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 @@ public:
 	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);

--- a/LEGO1/lego/legoomni/include/legoinputmanager.h
+++ b/LEGO1/lego/legoomni/include/legoinputmanager.h
@@ -87,7 +87,12 @@ public:
 	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
--- a/LEGO1/lego/legoomni/include/police.h
+++ b/LEGO1/lego/legoomni/include/police.h
@@ -59,6 +59,9 @@ public:

 	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 @@ public:

 	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

--- a/LEGO1/lego/legoomni/include/raceskel.h
+++ b/LEGO1/lego/legoomni/include/raceskel.h
@@ -17,6 +17,8 @@ public:

 	MxResult FUN_1001c360(float p_und, Matrix4& p_transform) override;

+	virtual void FUN_10071c80(Vector3& p_vec);
+
 	void GetCurrentAnimData(float* p_outCurAnimPosition, float* p_outCurAnimDuration);

 	// SYNTHETIC: LEGO1 0x10071cf0