From 602141fb11e2614583caa23b250ca115ce451c99 Mon Sep 17 00:00:00 2001
From: MegaMech <MegaMech@users.noreply.github.com>
Date: Wed, 18 Jun 2025 12:57:52 -0600
Subject: [PATCH] Fix custom track water (#229)

* Interpolation ApplyMatrixTransformations

* Fix scenefile saving and add skybox export

* Fix custom track water set bug

* Remove C++ version of harbour

---------

Co-authored-by: MegaMech <7255464+MegaMech@users.noreply.github.com>
---
 src/engine/courses/Course.cpp | 7 +++++--
 src/port/Game.cpp             | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/engine/courses/Course.cpp b/src/engine/courses/Course.cpp
index 94d634373..85223a7c5 100644
--- a/src/engine/courses/Course.cpp
+++ b/src/engine/courses/Course.cpp
@@ -45,7 +45,7 @@ Course::Course() {
     Props.Minimap.FinishlineX = 0;
     Props.Minimap.FinishlineY = 0;
     Props.Minimap.Colour = {255, 255, 255};
-    Props.WaterLevel = -10.0f;
+    Props.WaterLevel = FLT_MAX;
 
     Props.LakituTowType = (s32) OLakitu::LakituTowType::NORMAL;
     Props.AIBehaviour = D_0D008F28;
@@ -150,7 +150,10 @@ void Course::Load() {
             Course::Init();
             ParseCourseSections(sections, size);
             func_80295C6C();
-            Props.WaterLevel = gCourseMinY - 10.0f;
+
+            if (Props.WaterLevel == FLT_MAX) {
+                Props.WaterLevel = gCourseMinY - 10.0f;
+            }
         } else {
             printf("Course.cpp: Custom track sections are invalid\n");
         }
diff --git a/src/port/Game.cpp b/src/port/Game.cpp
index 63faab45c..bd7785024 100644
--- a/src/port/Game.cpp
+++ b/src/port/Game.cpp
@@ -107,7 +107,7 @@ void CustomEngineInit() {
     Course* doubleDeck    = gWorldInstance.AddCourse(std::make_unique<DoubleDeck>());
     Course* dkJungle      = gWorldInstance.AddCourse(std::make_unique<DKJungle>());
     Course* bigDonut      = gWorldInstance.AddCourse(std::make_unique<BigDonut>());
-    Course* harbour       = gWorldInstance.AddCourse(std::make_unique<Harbour>());
+//    Course* harbour       = gWorldInstance.AddCourse(std::make_unique<Harbour>());
     Course* testCourse    = gWorldInstance.AddCourse(std::make_unique<TestCourse>());
 
     gPodiumCeremony = std::make_unique<PodiumCeremony>();