Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-17 21:25:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'day_length' into jgrpp

Browse Source 
# Conflicts:
#	src/saveload/afterload.cpp
This commit is contained in:
Jonathan G Rennison 2017-03-05 15:29:45 +00:00
commit fa044852d5
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/saveload/afterload.cpp
View File

@ -759,6 +759,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);

1
src/saveload/extended_ver_sl.cpp
View File

@ -136,6 +136,7 @@ void SlXvResetState()
{
_sl_is_ext_version = false;
_sl_is_faked_ext = false;
_sl_xv_discardable_chunk_ids.clear();
memset(_sl_xv_feature_versions, 0, sizeof(_sl_xv_feature_versions));
}