From 5d680d9154512bbaa5eab54c01b77408e2b7c3d6 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Sat, 1 Aug 2015 18:03:07 +0100 Subject: [PATCH] Implement version setting in SlXvSetCurrentState Call in ClearSaveLoadState --- src/saveload/extended_ver_sl.cpp | 5 ++++- src/saveload/saveload.cpp | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/saveload/extended_ver_sl.cpp b/src/saveload/extended_ver_sl.cpp index 478e6d2f34..7127faf7b6 100644 --- a/src/saveload/extended_ver_sl.cpp +++ b/src/saveload/extended_ver_sl.cpp @@ -108,7 +108,10 @@ void SlXvSetCurrentState() SlXvResetState(); _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; + } } /** diff --git a/src/saveload/saveload.cpp b/src/saveload/saveload.cpp index b369af5627..55a37f8ee8 100644 --- a/src/saveload/saveload.cpp +++ b/src/saveload/saveload.cpp @@ -2467,6 +2467,8 @@ static inline void ClearSaveLoadState() delete _sl.lf; _sl.lf = NULL; + + SlXvSetCurrentState(); } /**