Merge branch 'save_ext' into jgrpp

2018-01-12 01:14:12 +00:00
parent dda20d08c1 15fea054fb
commit 5db5581684
2 changed files with 8 additions and 0 deletions
--- a/src/saveload/extended_ver_sl.cpp
+++ b/src/saveload/extended_ver_sl.cpp
@@ -95,6 +95,8 @@ bool SlXvFeatureTest::IsFeaturePresent(uint16 savegame_version, uint16 savegame_
 {
 	bool savegame_version_ok = savegame_version >= savegame_version_from && savegame_version <= savegame_version_to;

+	if (this->functor) return (*this->functor)(savegame_version, savegame_version_ok);
+
 	if (this->feature == XSLFI_NULL) return savegame_version_ok;

 	bool feature_ok = SlXvIsFeaturePresent(this->feature, this->min_version, this->max_version);