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

Merge branch 'jgrpp' into chunnel

Browse Source
This commit is contained in:
Jonathan G Rennison
2017-03-05 15:30:27 +00:00
parent 500ef49694 fa044852d5
commit 0690dbb8bf
4 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/saveload/afterload.cpp
View File

@@ -780,6 +780,11 @@ bool AfterLoadGame()
assert(_tick_skip_counter < _settings_game.economy.day_length_factor);
}
/* Set day length factor to 1 if loading a pre day length savegame */
if (SlXvIsFeatureMissing(XSLFI_VARIABLE_DAY_LENGTH) && SlXvIsFeatureMissing(XSLFI_SPRINGPP)) {
_settings_game.economy.day_length_factor = 1;
}
/* Update current year
* must be done before loading sprites as some newgrfs check it */
SetDate(_date, _date_fract);
@@ -3376,6 +3381,11 @@ bool AfterLoadGame()
_settings_game.economy.town_cargo_scale_factor = _settings_game.economy.old_town_cargo_factor * 10;
}
/* Set day length factor to 1 if loading a pre day length savegame */
if (SlXvIsFeatureMissing(XSLFI_VARIABLE_DAY_LENGTH) && SlXvIsFeatureMissing(XSLFI_SPRINGPP)) {
_settings_game.economy.day_length_factor = 1;
}
/* Road stops is 'only' updating some caches */
AfterLoadRoadStops();
AfterLoadLabelMaps();