From bd4fc752e6a5525371b9184a687557c48052093d Mon Sep 17 00:00:00 2001
From: jonschz <jonschz@users.noreply.github.com>
Date: Tue, 3 Sep 2024 22:14:27 +0200
Subject: [PATCH] Address review comments

---
 LEGO1/lego/legoomni/include/legocarbuild.h       | 5 +++--
 LEGO1/lego/legoomni/src/build/legocarbuild.cpp   | 3 ---
 LEGO1/lego/legoomni/src/common/legogamestate.cpp | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/legocarbuild.h b/LEGO1/lego/legoomni/include/legocarbuild.h
index ca9334a3..d005cf3c 100644
--- a/LEGO1/lego/legoomni/include/legocarbuild.h
+++ b/LEGO1/lego/legoomni/include/legocarbuild.h
@@ -74,14 +74,15 @@ class LegoCarBuild : public LegoWorld {
 		return "LegoCarBuild";
 	}
 
+	MxLong Notify(MxParam& p_param) override; // vtable+0x04
+	MxResult Tickle() override;               // vtable+0x08
+
 	// FUNCTION: LEGO1 0x10022950
 	MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, LegoCarBuild::ClassName()) || LegoWorld::IsA(p_name);
 	}
 
-	MxLong Notify(MxParam& p_param) override;                          // vtable+0x04
-	MxResult Tickle() override;                                        // vtable+0x08
 	MxResult Create(MxDSAction& p_dsAction) override;                  // vtable+0x18
 	void ReadyWorld() override;                                        // vtable+0x50
 	MxBool VTable0x5c() override;                                      // vtable+0x5c
diff --git a/LEGO1/lego/legoomni/src/build/legocarbuild.cpp b/LEGO1/lego/legoomni/src/build/legocarbuild.cpp
index 62535af2..5241638d 100644
--- a/LEGO1/lego/legoomni/src/build/legocarbuild.cpp
+++ b/LEGO1/lego/legoomni/src/build/legocarbuild.cpp
@@ -261,7 +261,6 @@ void LegoCarBuild::VTable0x74(MxFloat p_param1[3], MxFloat p_param2[3])
 	p_param2[0] = (fVar1 * local14[0] + local20[0]) - m_unk0x2a4[0];
 	p_param2[1] = (fVar1 * local14[1] + local20[1]) - m_unk0x2a4[1];
 	p_param2[2] = 0.0;
-	return;
 }
 
 // FUNCTION: LEGO1 0x10023570
@@ -317,7 +316,6 @@ void LegoCarBuild::VTable0x80(MxFloat p_param1[2], MxFloat p_param2[2], MxFloat
 // FUNCTION: BETA10 0x1006c18f
 MxResult LegoCarBuild::Tickle()
 {
-
 	if (!m_worldStarted) {
 		LegoWorld::Tickle();
 		return SUCCESS;
@@ -551,7 +549,6 @@ void LegoCarBuild::FUN_10025db0(const char* p_param1, undefined4 p_param2)
 		if (sVar3 != g_unk0x100f11cc) {
 			TogglePresentersEnabled();
 			g_unk0x100f11cc = sVar3;
-			return;
 		}
 	}
 	else {
diff --git a/LEGO1/lego/legoomni/src/common/legogamestate.cpp b/LEGO1/lego/legoomni/src/common/legogamestate.cpp
index eaf81756..75f0ba2a 100644
--- a/LEGO1/lego/legoomni/src/common/legogamestate.cpp
+++ b/LEGO1/lego/legoomni/src/common/legogamestate.cpp
@@ -3,7 +3,6 @@
 #include "3dmanager/lego3dmanager.h"
 #include "act2main_actions.h"
 #include "act3_actions.h"
-#include "assert.h"
 #include "carrace_actions.h"
 #include "carracer_actions.h"
 #include "copter_actions.h"
@@ -57,6 +56,7 @@
 #include "scripts.h"
 #include "sndanim_actions.h"
 
+#include <assert.h>
 #include <stdio.h>
 
 DECOMP_SIZE_ASSERT(LegoGameState::Username, 0x0e)