From 207c79a736bb9d94ffded6955612c38559bb543b Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Wed, 16 Dec 2020 01:31:46 +0000 Subject: [PATCH] Saveload: Fix SLE*_CONDSSTR* macros --- src/saveload/plans_sl.cpp | 4 ++-- src/saveload/saveload.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/saveload/plans_sl.cpp b/src/saveload/plans_sl.cpp index a1123b9b9c..43fc8087e5 100644 --- a/src/saveload/plans_sl.cpp +++ b/src/saveload/plans_sl.cpp @@ -19,8 +19,8 @@ static const SaveLoad _plan_desc[] = { SLE_VAR(Plan, visible, SLE_BOOL), SLE_VAR(Plan, visible_by_all, SLE_BOOL), SLE_VAR(Plan, creation_date, SLE_INT32), - SLE_CONDSSSTR_X(Plan, name, 0, SL_MIN_VERSION, SL_MAX_VERSION, SlXvFeatureTest(XSLFTO_AND, XSLFI_ENH_VIEWPORT_PLANS, 3)), - SLE_CONDSSSTR_X(Plan, name, 0, SL_MIN_VERSION, SL_MAX_VERSION, SlXvFeatureTest(XSLFTO_AND, XSLFI_JOKERPP, SL_JOKER_1_20)), + SLE_CONDSSTR_X(Plan, name, 0, SL_MIN_VERSION, SL_MAX_VERSION, SlXvFeatureTest(XSLFTO_AND, XSLFI_ENH_VIEWPORT_PLANS, 3)), + SLE_CONDSSTR_X(Plan, name, 0, SL_MIN_VERSION, SL_MAX_VERSION, SlXvFeatureTest(XSLFTO_AND, XSLFI_JOKERPP, SL_JOKER_1_20)), SLE_CONDVAR_X(Plan, colour, SLE_UINT8, SL_MIN_VERSION, SL_MAX_VERSION, SlXvFeatureTest(XSLFTO_AND, XSLFI_ENH_VIEWPORT_PLANS, 4)), SLE_END() }; diff --git a/src/saveload/saveload.h b/src/saveload/saveload.h index c9fd0ef3b4..a12f9b0b10 100644 --- a/src/saveload/saveload.h +++ b/src/saveload/saveload.h @@ -634,7 +634,7 @@ typedef SaveLoad SaveLoadGlobVarList; * @param to Last savegame version that has the string. * @param extver SlXvFeatureTest to test (along with from and to) which savegames have the field */ -#define SLE_CONDSSSTR_X(base, variable, type, from, to, extver) SLE_GENERAL_X(SL_STDSTR, base, variable, type, 0, from, to, extver) +#define SLE_CONDSSTR_X(base, variable, type, from, to, extver) SLE_GENERAL_X(SL_STDSTR, base, variable, type, 0, from, to, extver) #define SLE_CONDSSTR(base, variable, type, from, to) SLE_GENERAL(SL_STDSTR, base, variable, type, 0, from, to) /** @@ -854,6 +854,7 @@ typedef SaveLoad SaveLoadGlobVarList; * @param from First savegame version that has the string. * @param to Last savegame version that has the string. */ +#define SLEG_CONDSSTR_X(variable, type, from, to, extver) SLEG_GENERAL_X(SL_STDSTR, variable, type, 0, from, to, extver) #define SLEG_CONDSSTR(variable, type, from, to) SLEG_GENERAL(SL_STDSTR, variable, type, 0, from, to) /**