Fix #10904: RCT1/LL-scenarios with red water won't open (#10905)

Co-authored-by: Ted John <ted@brambles.org>
This commit is contained in:
Michael Steenbeek 2020-03-11 19:21:02 +01:00 committed by GitHub
parent e441019b04
commit 8113c89f9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

@ -33,6 +33,7 @@
- Fix: [#10752] Mute button state not correctly set at startup.
- Fix: [#10822] Can place too many peep spawns.
- Fix: [#10898] Banner text has an offset in tile inspector window.
- Fix: [#10904] RCT1/LL-scenarios with red water won't open.
- Improved: [#682] The staff patrol area is now drawn on the water, instead of on the surface under water.
- Improved: [#10858] Added horizontal grid lines to finance charts.
- Removed: [#6898] LOADMM and LOADRCT1 title sequence commands (use LOADSC instead).

View File

@ -171,6 +171,7 @@ public:
_s4 = *ReadAndDecodeS4(stream, isScenario);
_s4Path = path;
_isScenario = isScenario;
_gameVersion = sawyercoding_detect_rct1_version(_s4.game_version) & FILE_VERSION_MASK;
// Only determine what objects we required to import this saved game
InitialiseEntryMaps();
@ -321,11 +322,9 @@ private:
void Initialise()
{
_gameVersion = sawyercoding_detect_rct1_version(_s4.game_version) & FILE_VERSION_MASK;
// Avoid reusing the value used for last import
_parkValueConversionFactor = 0;
InitialiseEntryMaps();
uint16_t mapSize = _s4.map_size == 0 ? 128 : _s4.map_size;
String::Set(gScenarioFileName, sizeof(gScenarioFileName), GetRCT1ScenarioName().c_str());