From b41438bbc969283904e3eaed538ec3f8e5460721 Mon Sep 17 00:00:00 2001
From: HtotheTML <108596959+HtotheTML@users.noreply.github.com>
Date: Tue, 14 Mar 2023 12:26:51 -0700
Subject: [PATCH] Fix missing water tile in Infernal Views (#19641)

* Update S6Importer.cpp

Edit a stray tile in the lava river of Infernal Views to have its missing lava.

* Update changelog.txt

* Update contributors.md
---
 contributors.md                  |  1 +
 distribution/changelog.txt       |  1 +
 src/openrct2/rct2/S6Importer.cpp | 11 +++++++++++
 3 files changed, 13 insertions(+)

diff --git a/contributors.md b/contributors.md
index 26b7168cda..e99cbbb78e 100644
--- a/contributors.md
+++ b/contributors.md
@@ -212,6 +212,7 @@ The following people are not part of the development team, but have been contrib
 * (zzril)
 * Ernest Elgin (eaeiv)
 * Ernest Wong (ErnWong)
+* Joel H. (HtotheTML)
 
 
 ## Toolchain
diff --git a/distribution/changelog.txt b/distribution/changelog.txt
index 1d059de8f1..80ae0cbc6d 100644
--- a/distribution/changelog.txt
+++ b/distribution/changelog.txt
@@ -65,6 +65,7 @@
 - Fix: [#19493] SV4 saves not importing the correct vehicle colours.
 - Fix: [#19517] Crash when peeps try to exit or enter hacked rides that have no waypoints specified.
 - Fix: [#19524] Staff counter shows incorrect values if there are more than 32767 staff members.
+- Fix: [#19641] Missing water tile in Infernal Views' river.
 
 0.4.3 (2022-12-14)
 ------------------------------------------------------------------------
diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp
index 7a86c840f2..552596adc2 100644
--- a/src/openrct2/rct2/S6Importer.cpp
+++ b/src/openrct2/rct2/S6Importer.cpp
@@ -507,6 +507,7 @@ namespace RCT2
 
             FixLandOwnership();
             FixAyersRockScenario();
+            FixInfernalViewsScenario();
 
             ResearchDetermineFirstOfType();
             UpdateConsolidatedPatrolAreas();
@@ -695,6 +696,16 @@ namespace RCT2
             }
         }
 
+        void FixInfernalViewsScenario() const
+        {
+            if (!_isScenario || !String::Equals(_s6.ScenarioFilename, "Infernal Views.SC6"))
+                return;
+
+            auto surfaceElement = MapGetSurfaceElementAt(TileCoordsXY{ 45, 62 }.ToCoordsXY());
+
+            surfaceElement->SetWaterHeight(96);
+        }
+
         void ImportRides()
         {
             for (uint8_t index = 0; index < Limits::MaxRidesInPark; index++)