1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-10 09:32:29 +01:00

Fix #7969: Loading landscape resets money, inventions and objective (#12520)

This commit is contained in:
Michael Steenbeek
2020-07-30 21:43:46 +02:00
committed by GitHub
parent b0c67762b7
commit cd86d3d757
2 changed files with 4 additions and 1 deletions

View File

@@ -25,6 +25,7 @@
- Fix: [#6119] Advertising campaign for ride window not updated properly (original bug).
- Fix: [#7006] Submarine Ride is in the wrong research group.
- Fix: [#7324] Research window shows vehicle name instead of ride name.
- Fix: [#7969, #8175, #12501] When loading a landscape in the Scenario Editor, the inventions list, financial settings and objective settings are reset.
- Fix: [#10634] Guests are unable to use uphill paths out of toilets.
- Fix: [#10876] When removing a path, its guest entry point is not removed.
- Fix: [#10876] There can be multiple peep spawns on the same location.

View File

@@ -270,6 +270,7 @@ namespace Editor
static bool ReadS6(const char* path)
{
auto extension = path_get_extension(path);
auto loadedFromSave = false;
if (_stricmp(extension, ".sc6") == 0)
{
load_from_sc6(path);
@@ -277,9 +278,10 @@ namespace Editor
else if (_stricmp(extension, ".sv6") == 0 || _stricmp(extension, ".sv7") == 0)
{
load_from_sv6(path);
loadedFromSave = true;
}
ClearMapForEditing(true);
ClearMapForEditing(loadedFromSave);
gS6Info.editor_step = EDITOR_STEP_LANDSCAPE_EDITOR;
gScreenAge = 0;