From 3ce7750cca801b6a4719747f513e428892c4e749 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Fri, 17 Jan 2025 17:23:55 -0700
Subject: [PATCH] More order

---
 CMakeLists.txt                                |  5 +--
 .../legoomni/include/legoanimmmpresenter.h    |  4 +++
 LEGO1/lego/legoomni/include/towtrack.h        | 36 +++++++++++++++++--
 LEGO1/lego/legoomni/src/actors/towtrack.cpp   | 34 ------------------
 4 files changed, 41 insertions(+), 38 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 46138634..90e7e230 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -349,12 +349,13 @@ function(add_lego_libraries NAME)
     LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp
     LEGO1/lego/legoomni/src/common/legophoneme.cpp
     LEGO1/lego/legoomni/src/paths/legopathcontroller.cpp
-    LEGO1/lego/legoomni/src/actors/act3ammo.cpp
-    LEGO1/lego/legoomni/src/entity/legojetskiraceactor.cpp
     LEGO1/lego/legoomni/src/audio/lego3dwavepresenter.cpp
     LEGO1/lego/legoomni/src/common/legoanimmmpresenter.cpp
     LEGO1/lego/legoomni/src/common/mxtransitionmanager.cpp
     LEGO1/lego/legoomni/src/actors/towtrack.cpp
+
+    LEGO1/lego/legoomni/src/actors/act3ammo.cpp
+    LEGO1/lego/legoomni/src/entity/legojetskiraceactor.cpp
     LEGO1/lego/legoomni/src/entity/act2policestation.cpp
     LEGO1/lego/legoomni/src/video/legophonemepresenter.cpp
     LEGO1/lego/legoomni/src/video/legotexturepresenter.cpp
diff --git a/LEGO1/lego/legoomni/include/legoanimmmpresenter.h b/LEGO1/lego/legoomni/include/legoanimmmpresenter.h
index a0b05727..d73cd55d 100644
--- a/LEGO1/lego/legoomni/include/legoanimmmpresenter.h
+++ b/LEGO1/lego/legoomni/include/legoanimmmpresenter.h
@@ -1,6 +1,10 @@
 #ifndef LEGOANIMMMPRESENTER_H
 #define LEGOANIMMMPRESENTER_H
 
+// MxDSActionListCursor needs to be included before std::list
+// clang-format off
+#include "mxdsmultiaction.h"
+// clang-format on
 #include "mxcompositepresenter.h"
 
 class LegoAnimPresenter;
diff --git a/LEGO1/lego/legoomni/include/towtrack.h b/LEGO1/lego/legoomni/include/towtrack.h
index 7a5f50b4..812751bf 100644
--- a/LEGO1/lego/legoomni/include/towtrack.h
+++ b/LEGO1/lego/legoomni/include/towtrack.h
@@ -14,6 +14,40 @@ class TowTrackMissionState : public LegoState {
 public:
 	TowTrackMissionState();
 
+	// FUNCTION: LEGO1 0x1004dde0
+	// FUNCTION: BETA10 0x100f8720
+	MxResult Serialize(LegoStorage* p_storage) override
+	{
+		LegoState::Serialize(p_storage);
+
+		if (p_storage->IsReadMode()) {
+			p_storage->ReadS16(m_peScore);
+			p_storage->ReadS16(m_maScore);
+			p_storage->ReadS16(m_paScore);
+			p_storage->ReadS16(m_niScore);
+			p_storage->ReadS16(m_laScore);
+			p_storage->ReadS16(m_peHighScore);
+			p_storage->ReadS16(m_maHighScore);
+			p_storage->ReadS16(m_paHighScore);
+			p_storage->ReadS16(m_niHighScore);
+			p_storage->ReadS16(m_laHighScore);
+		}
+		else if (p_storage->IsWriteMode()) {
+			p_storage->WriteS16(m_peScore);
+			p_storage->WriteS16(m_maScore);
+			p_storage->WriteS16(m_paScore);
+			p_storage->WriteS16(m_niScore);
+			p_storage->WriteS16(m_laScore);
+			p_storage->WriteS16(m_peHighScore);
+			p_storage->WriteS16(m_maHighScore);
+			p_storage->WriteS16(m_paHighScore);
+			p_storage->WriteS16(m_niHighScore);
+			p_storage->WriteS16(m_laHighScore);
+		}
+
+		return SUCCESS;
+	} // vtable+0x1c
+
 	// FUNCTION: LEGO1 0x1004dfa0
 	// FUNCTION: BETA10 0x100f8920
 	const char* ClassName() const override // vtable+0x0c
@@ -28,8 +62,6 @@ class TowTrackMissionState : public LegoState {
 		return !strcmp(p_name, TowTrackMissionState::ClassName()) || LegoState::IsA(p_name);
 	}
 
-	MxResult Serialize(LegoStorage* p_storage) override; // vtable+0x1c
-
 	// FUNCTION: BETA10 0x10088890
 	MxS16 GetHighScore(MxU8 p_actorId)
 	{
diff --git a/LEGO1/lego/legoomni/src/actors/towtrack.cpp b/LEGO1/lego/legoomni/src/actors/towtrack.cpp
index 878d4e90..fb4632e2 100644
--- a/LEGO1/lego/legoomni/src/actors/towtrack.cpp
+++ b/LEGO1/lego/legoomni/src/actors/towtrack.cpp
@@ -607,37 +607,3 @@ TowTrackMissionState::TowTrackMissionState()
 	m_niHighScore = 0;
 	m_laHighScore = 0;
 }
-
-// FUNCTION: LEGO1 0x1004dde0
-// FUNCTION: BETA10 0x100f8720
-MxResult TowTrackMissionState::Serialize(LegoStorage* p_storage)
-{
-	LegoState::Serialize(p_storage);
-
-	if (p_storage->IsReadMode()) {
-		p_storage->ReadS16(m_peScore);
-		p_storage->ReadS16(m_maScore);
-		p_storage->ReadS16(m_paScore);
-		p_storage->ReadS16(m_niScore);
-		p_storage->ReadS16(m_laScore);
-		p_storage->ReadS16(m_peHighScore);
-		p_storage->ReadS16(m_maHighScore);
-		p_storage->ReadS16(m_paHighScore);
-		p_storage->ReadS16(m_niHighScore);
-		p_storage->ReadS16(m_laHighScore);
-	}
-	else if (p_storage->IsWriteMode()) {
-		p_storage->WriteS16(m_peScore);
-		p_storage->WriteS16(m_maScore);
-		p_storage->WriteS16(m_paScore);
-		p_storage->WriteS16(m_niScore);
-		p_storage->WriteS16(m_laScore);
-		p_storage->WriteS16(m_peHighScore);
-		p_storage->WriteS16(m_maHighScore);
-		p_storage->WriteS16(m_paHighScore);
-		p_storage->WriteS16(m_niHighScore);
-		p_storage->WriteS16(m_laHighScore);
-	}
-
-	return SUCCESS;
-}