From e3009cfe9cc0a824450d3e71a0ce8d6b5cd9ff91 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 19 Apr 2015 22:02:33 +0300
Subject: Add quick settings page for yellow bar options.

---
 src/gamemodifiers.h | 38 ++++++++++++--------------------------
 1 file changed, 12 insertions(+), 26 deletions(-)

(limited to 'src/gamemodifiers.h')

diff --git a/src/gamemodifiers.h b/src/gamemodifiers.h
index d3ef572e0..6859018cc 100644
--- a/src/gamemodifiers.h
+++ b/src/gamemodifiers.h
@@ -26,11 +26,6 @@
 #include "localconsts.h"
 
 #define declModifier(name1) \
-    static std::string get##name1##String(); \
-    static const unsigned m##name1##Size; \
-    static const char *const m##name1##Strings[];
-
-#define declModifier2(name1) \
     static void change##name1(const bool forward); \
     static std::string get##name1##String(); \
     static const unsigned m##name1##Size; \
@@ -52,28 +47,20 @@ class GameModifiers final
                                const bool forward);
 
         declModifier(MoveType)
-        declModifier2(CrazyMoveType)
-        declModifier2(MoveToTargetType)
-        declModifier2(FollowMode)
-        declModifier2(AttackWeaponType)
-        declModifier2(AttackType)
-        declModifier2(QuickDropCounter)
-        declModifier2(PickUpType)
-        declModifier2(MagicAttackType)
-        declModifier2(PvpAttackType)
-        declModifier2(ImitationMode)
+        declModifier(CrazyMoveType)
+        declModifier(MoveToTargetType)
+        declModifier(FollowMode)
+        declModifier(AttackWeaponType)
+        declModifier(AttackType)
+        declModifier(QuickDropCounter)
+        declModifier(PickUpType)
+        declModifier(MagicAttackType)
+        declModifier(PvpAttackType)
+        declModifier(ImitationMode)
+        declModifier(GameModifiers)
         declModifier(MapDrawType)
         declModifier(CameraMode)
-        declModifier(AwayMode);
-
-        static void changeAwayMode();
-
-        static void changeMoveType(const bool forward);
-
-        static std::string getGameModifiersString();
-        static void changeGameModifiers();
-        static const unsigned mGameModifiersSize;
-        static const char *const mGameModifiersStrings[];
+        declModifier(AwayMode)
 
         static void setQuickDropCounter(const int n);
 
@@ -86,6 +73,5 @@ class GameModifiers final
 };
 
 #undef declModifier
-#undef declModifier2
 
 #endif  // GAMEMODIFIERS_H
-- 
cgit v1.2.3-60-g2f50