diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 80ae0cbc6d..689ebf5849 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -65,7 +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. +- Fix: [#19641] Missing water tile in Infernal Views' and Six Flags Holland's river. 0.4.3 (2022-12-14) ------------------------------------------------------------------------ @@ -1683,4 +1683,4 @@ This is the first fully implemented version of OpenRCT2. RCT2.EXE is no longer r - Feature: RollerCoaster Tycoon 1 scenarios can now be opened in the scenario editor or by using the ‘edit’ command line action. - Feature: The ‘have fun’ objective can now be selected in the scenario editor. - Feature: Twitch integration. -- Fix: Litter bins now get full and require emptying by handymen. +- Fix: Litter bins now get full and require emptying by handymen. \ No newline at end of file diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index 552596adc2..76fe31644a 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -506,8 +506,8 @@ namespace RCT2 park.Name = GetUserString(_s6.ParkName); FixLandOwnership(); + FixWater(); FixAyersRockScenario(); - FixInfernalViewsScenario(); ResearchDetermineFirstOfType(); UpdateConsolidatedPatrolAreas(); @@ -642,6 +642,30 @@ namespace RCT2 } } + void FixWater() const + { + if (!_isScenario) + { + return; + } + if (String::Equals(_s6.ScenarioFilename, "Infernal Views.SC6", true) + || String::Equals(_s6.ScenarioFilename, "infernal views.sea", true)) + { + auto surfaceElement = MapGetSurfaceElementAt(TileCoordsXY{ 45, 62 }.ToCoordsXY()); + + surfaceElement->SetWaterHeight(96); + } + else if ( + String::Equals(_s6.ScenarioFilename, "Six Flags Holland.SC6") + || String::Equals(_s6.ScenarioFilename, "six flags holland.sea", true)) + + { + auto surfaceElement = MapGetSurfaceElementAt(TileCoordsXY{ 126, 73 }.ToCoordsXY()); + + surfaceElement->SetWaterHeight(96); + } + } + void FixAyersRockScenario() const { if (!_isScenario || !String::Equals(_s6.ScenarioFilename, "Australasia - Ayers Rock.SC6")) @@ -696,16 +720,6 @@ 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++)