mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix water tile in Six Flags Holland (and merge with Infernal Views fix) (#19643) 

* Update S6Importer.cpp

* Update changelog.txt
This commit is contained in:
HtotheTML 2023-03-16 01:00:59 -07:00 committed by GitHub
parent a102688f5c
commit e6a0262522
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
distribution/changelog.txt
View File

@ -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.

36
src/openrct2/rct2/S6Importer.cpp
View File

@ -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++)