From 30621a6ee88b60a2bd70b393f75a1f391fcb1adc Mon Sep 17 00:00:00 2001
From: jonschz <jonschz@users.noreply.github.com>
Date: Sat, 23 Nov 2024 20:25:55 +0100
Subject: [PATCH] Address review comments, part 2

---
 LEGO1/lego/legoomni/src/build/legocarbuild.cpp |  3 ++-
 LEGO1/lego/legoomni/src/race/carrace.cpp       | 13 +++++++------
 LEGO1/lego/legoomni/src/race/jetskirace.cpp    |  4 ++--
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/LEGO1/lego/legoomni/src/build/legocarbuild.cpp b/LEGO1/lego/legoomni/src/build/legocarbuild.cpp
index d981be73..b86fecd4 100644
--- a/LEGO1/lego/legoomni/src/build/legocarbuild.cpp
+++ b/LEGO1/lego/legoomni/src/build/legocarbuild.cpp
@@ -12,6 +12,7 @@
 #include "legocontrolmanager.h"
 #include "legogamestate.h"
 #include "legoinputmanager.h"
+#include "legomain.h"
 #include "legosoundmanager.h"
 #include "legoutils.h"
 #include "misc.h"
@@ -1254,7 +1255,7 @@ void LegoCarBuild::FUN_10024ef0()
 	m_buildState->m_animationState = LegoVehicleBuildState::e_cutscene;
 	FUN_10025720(FUN_10025d70());
 	m_buildState->m_unk0x4c += 1;
-	FUN_10015820(FALSE, 7);
+	FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
 }
 
 // FUNCTION: LEGO1 0x10024f30
diff --git a/LEGO1/lego/legoomni/src/race/carrace.cpp b/LEGO1/lego/legoomni/src/race/carrace.cpp
index deaa9387..332a4064 100644
--- a/LEGO1/lego/legoomni/src/race/carrace.cpp
+++ b/LEGO1/lego/legoomni/src/race/carrace.cpp
@@ -1,12 +1,14 @@
 #include "carrace.h"
 
 #include "actions/carrace_actions.h"
+#include "actions/jukebox_actions.h"
 #include "dunebuggy.h"
 #include "isle.h"
 #include "legoanimationmanager.h"
 #include "legobackgroundcolor.h"
 #include "legocontrolmanager.h"
 #include "legohideanimpresenter.h"
+#include "legomain.h"
 #include "legonavcontroller.h"
 #include "legopathstruct.h"
 #include "legoracers.h"
@@ -106,8 +108,7 @@ MxResult CarRace::Create(MxDSAction& p_dsAction)
 	InvokeAction(Extra::e_start, m_atomId, streamId, NULL);
 	InvokeAction(Extra::e_start, m_atomId, CarraceScript::c_RaceCarDashboard, NULL);
 
-	// TODO
-	return SUCCESS;
+	return result;
 }
 
 // FUNCTION: LEGO1 0x10016dd0
@@ -120,11 +121,11 @@ void CarRace::ReadyWorld()
 
 	MxDSAction action;
 	action.SetAtomId(*g_jukeboxScript);
-	action.SetObjectId(16);
+	action.SetObjectId(JukeboxScript::c_RaceTrackRoad_Music);
 
 	BackgroundAudioManager()->PlayMusic(action, 5, MxPresenter::e_repeating);
 	AnimationManager()->Resume();
-	FUN_10015820(FALSE, 7);
+	FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
 
 	m_unk0x144 = g_unk0x100d5d10[rand() & 7];
 
@@ -264,7 +265,7 @@ MxLong CarRace::HandlePathStruct(LegoPathStructNotificationParam& p_param)
 				break;
 			}
 
-			FUN_10017820(0xb, paramData);
+			FUN_10017820(11, paramData);
 			m_unk0x108 = paramData;
 
 			if (m_unk0x108 == 0x14) {
@@ -291,7 +292,7 @@ MxLong CarRace::HandlePathStruct(LegoPathStructNotificationParam& p_param)
 				break;
 			}
 
-			FUN_10017820(0xc, paramData);
+			FUN_10017820(12, paramData);
 
 			m_unk0x10c = paramData;
 
diff --git a/LEGO1/lego/legoomni/src/race/jetskirace.cpp b/LEGO1/lego/legoomni/src/race/jetskirace.cpp
index 757aba08..65696e5b 100644
--- a/LEGO1/lego/legoomni/src/race/jetskirace.cpp
+++ b/LEGO1/lego/legoomni/src/race/jetskirace.cpp
@@ -220,7 +220,7 @@ MxLong JetskiRace::HandlePathStruct(LegoPathStructNotificationParam& p_param)
 				break;
 			}
 
-			FUN_10016930(0xb, paramData);
+			FUN_10016930(11, paramData);
 			m_unk0x108 = paramData;
 
 			if (m_unk0x108 == 0x14) {
@@ -238,7 +238,7 @@ MxLong JetskiRace::HandlePathStruct(LegoPathStructNotificationParam& p_param)
 				break;
 			}
 
-			FUN_10016930(0xc, paramData);
+			FUN_10016930(12, paramData);
 
 			m_unk0x10c = paramData;