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

Merge branch 'save_ext' into progsig-sx

Browse Source
This commit is contained in:
Jonathan G Rennison
2015-08-01 18:17:30 +01:00
parent b1d8bcfe35 b3e102fe52
commit 3a3280e536
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/saveload/extended_ver_sl.cpp
View File

@@ -108,7 +108,10 @@ void SlXvSetCurrentState()
SlXvResetState(); SlXvResetState();
_sl_is_ext_version = true; _sl_is_ext_version = true;
// TODO: set versions for currently enabled features here const SlxiSubChunkInfo *info = _sl_xv_sub_chunk_infos;
for (; info->index != XSLFI_NULL; ++info) {
_sl_xv_feature_versions[info->index] = info->save_version;
}
} }
/** /**

2
src/saveload/saveload.cpp
View File

@@ -2469,6 +2469,8 @@ static inline void ClearSaveLoadState()
delete _sl.lf; delete _sl.lf;
_sl.lf = NULL; _sl.lf = NULL;
SlXvSetCurrentState();
} }
/** /**

2
src/settings.cpp
View File

@@ -2293,7 +2293,7 @@ static void LoadSettingsPatx(const SettingDesc *sd, void *object)
static const SaveLoad _settings_patx_desc[] = { static const SaveLoad _settings_patx_desc[] = {
SLE_VAR(SettingsPatxLoad, flags, SLE_UINT32), SLE_VAR(SettingsPatxLoad, flags, SLE_UINT32),
SLE_STR(SettingsPatxLoad, name, SLE_STRB, 255), SLE_STR(SettingsPatxLoad, name, SLE_STRB, 256),
SLE_VAR(SettingsPatxLoad, setting_length, SLE_UINT32), SLE_VAR(SettingsPatxLoad, setting_length, SLE_UINT32),
SLE_END() SLE_END()
}; };