From bbd487a2a7729ce0ddffd0e4864b882d5f3eeca9 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Wed, 13 Nov 2019 20:21:18 +0000 Subject: [PATCH] Revert "Avoid unnecessary calls to SettingsDisableElrail in AfterLoadGame" This reverts commit 5008a09fe920d0e56c74f8b7e0db28fa303930a6. This seems to cause regressions with some older savegames/GRF configurations. --- src/saveload/afterload.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp index 9785357d2b..4af3c9afbf 100644 --- a/src/saveload/afterload.cpp +++ b/src/saveload/afterload.cpp @@ -1678,11 +1678,8 @@ bool AfterLoadGame() /* from version 38 we have optional elrails, since we cannot know the * preference of a user, let elrails enabled; it can be disabled manually */ if (IsSavegameVersionBefore(SLV_38)) _settings_game.vehicle.disable_elrails = false; - if (IsSavegameVersionBefore(SLV_38) || _settings_game.vehicle.disable_elrails) { - SettingsDisableElrail(_settings_game.vehicle.disable_elrails); - } else { - ReinitGuiAfterToggleElrail(_settings_game.vehicle.disable_elrails); - } + /* do the same as when elrails were enabled/disabled manually just now */ + SettingsDisableElrail(_settings_game.vehicle.disable_elrails); InitializeRailGUI(); /* From version 53, the map array was changed for house tiles to allow