diff options
| -rw-r--r-- | src/gamemodifiers.cpp | 42 | ||||
| -rw-r--r-- | src/gamemodifiers.h | 10 |
2 files changed, 26 insertions, 26 deletions
diff --git a/src/gamemodifiers.cpp b/src/gamemodifiers.cpp index 3205c56bf..5aa73f97a 100644 --- a/src/gamemodifiers.cpp +++ b/src/gamemodifiers.cpp @@ -49,36 +49,36 @@ #include "debug.h" -#define addModifier(name1, name2, sz, ...) \ - const unsigned GameModifiers::m##name1##Size = sz; \ - const char *const GameModifiers::m##name1##Strings[] = \ - __VA_ARGS__; \ - std::string GameModifiers::get##name1##String() \ +#define addModifier(typeName, varName, size, ...) \ + const unsigned GameModifiers::m##typeName##Size = size; \ + const char *const GameModifiers::m##typeName##Strings[] = __VA_ARGS__; \ + std::string GameModifiers::get##typeName##String() \ { \ - return gettext(getVarItem(&m##name1##Strings[0], \ - CAST_U32(settings.name2), m##name1##Size)); \ + return gettext(getVarItem(&m##typeName##Strings[0], \ + CAST_U32(settings.varName), \ + m##typeName##Size)); \ } -#define addModifier2(name1, name2, str, sz, ...) \ - const unsigned GameModifiers::m##name1##Size = sz; \ - const char *const GameModifiers::m##name1##Strings[] = \ - __VA_ARGS__; \ - void GameModifiers::change##name1(const bool forward) \ +#define addModifier2(typeName, varName, str, size, ...) \ + const unsigned GameModifiers::m##typeName##Size = size; \ + const char *const GameModifiers::m##typeName##Strings[] = __VA_ARGS__; \ + void GameModifiers::change##typeName(const bool forward) \ { \ - changeMode(&settings.name2, m##name1##Size, str, \ - &GameModifiers::get##name1##String, 0, true, forward); \ + changeMode(&settings.varName, m##typeName##Size, str, \ + &GameModifiers::get##typeName##String, 0, true, forward); \ } \ - std::string GameModifiers::get##name1##String() \ + std::string GameModifiers::get##typeName##String() \ { \ - return gettext(getVarItem(&m##name1##Strings[0], \ - settings.name2, m##name1##Size)); \ + return gettext(getVarItem(&m##typeName##Strings[0], \ + settings.varName, \ + m##typeName##Size)); \ } -#define changeMethod(name1, name2, str) \ - void GameModifiers::change##name1(const bool forward) \ +#define changeMethod(typeName, varName, str) \ + void GameModifiers::change##typeName(const bool forward) \ { \ - changeMode(&settings.name2, m##name1##Size, str, \ - &GameModifiers::get##name1##String, 0, true, forward); \ + changeMode(&settings.varName, m##typeName##Size, str, \ + &GameModifiers::get##typeName##String, 0, true, forward); \ } void GameModifiers::init() diff --git a/src/gamemodifiers.h b/src/gamemodifiers.h index 63114cc22..768fac3f4 100644 --- a/src/gamemodifiers.h +++ b/src/gamemodifiers.h @@ -26,11 +26,11 @@ #include "localconsts.h" -#define declModifier(name1) \ - static void change##name1(const bool forward); \ - static std::string get##name1##String(); \ - static const unsigned m##name1##Size; \ - static const char *const m##name1##Strings[]; +#define declModifier(typeName) \ + static void change##typeName(const bool forward); \ + static std::string get##typeName##String(); \ + static const unsigned m##typeName##Size; \ + static const char *const m##typeName##Strings[]; class GameModifiers final { |