dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions 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
parent 702404dc6a 1f148322fb
commit fa044852d5
2 changed files with 6 additions and 0 deletions
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); 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 /* Update current year
* must be done before loading sprites as some newgrfs check it */ * must be done before loading sprites as some newgrfs check it */
SetDate(_date, _date_fract); 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_ext_version = false;
_sl_is_faked_ext = false; _sl_is_faked_ext = false;
_sl_xv_discardable_chunk_ids.clear();
memset(_sl_xv_feature_versions, 0, sizeof(_sl_xv_feature_versions)); memset(_sl_xv_feature_versions, 0, sizeof(_sl_xv_feature_versions));
} }