dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Avoid unnecessary calls to SettingsDisableElrail in AfterLoadGame"

Browse Source 
This reverts commit 5008a09fe9.

This seems to cause regressions with some older savegames/GRF configurations.
This commit is contained in:
Jonathan G Rennison
2019-11-13 20:21:18 +00:00
parent cbdd9f84d8
commit bbd487a2a7
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/saveload/afterload.cpp
View File

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