From d670395fff93f805b666e0cc4cc56cdb880e0bba Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 25 Jul 2014 22:03:28 +0300
Subject: Use all methods in gamemodifiers as static.

---
 src/gamemodifiers.h | 76 ++++++++++++++++++++++++++---------------------------
 1 file changed, 37 insertions(+), 39 deletions(-)

(limited to 'src/gamemodifiers.h')

diff --git a/src/gamemodifiers.h b/src/gamemodifiers.h
index 8ca57ef3f..497622236 100644
--- a/src/gamemodifiers.h
+++ b/src/gamemodifiers.h
@@ -34,73 +34,73 @@ class GameModifiers final
 
         ~GameModifiers();
 
-        void changeMode(unsigned *restrict const var,
-                        const unsigned limit,
-                        const char *restrict const conf,
-                        std::string (GameModifiers::*const func)(),
-                        const unsigned def,
-                        const bool save,
-                        const bool forward);
+        static void changeMode(unsigned *restrict const var,
+                               const unsigned limit,
+                               const char *restrict const conf,
+                               std::string (*const func)(),
+                               const unsigned def,
+                               const bool save,
+                               const bool forward);
 
-        void changeMoveType(const bool forward);
+        static void changeMoveType(const bool forward);
 
-        void changeCrazyMoveType(const bool forward);
+        static void changeCrazyMoveType(const bool forward);
 
-        void changeMoveToTargetType(const bool forward);
+        static void changeMoveToTargetType(const bool forward);
 
-        void changeFollowMode(const bool forward);
+        static void changeFollowMode(const bool forward);
 
-        void changeAttackWeaponType(const bool forward);
+        static void changeAttackWeaponType(const bool forward);
 
-        void changeAttackType(const bool forward);
+        static void changeAttackType(const bool forward);
 
-        void changeQuickDropCounter(const bool forward);
+        static void changeQuickDropCounter(const bool forward);
 
-        void changePickUpType(const bool forward);
+        static void changePickUpType(const bool forward);
 
-        void changeMagicAttackType(const bool forward);
+        static void changeMagicAttackType(const bool forward);
 
-        void changePvpAttackType(const bool forward);
+        static void changePvpAttackType(const bool forward);
 
-        void changeImitationMode(const bool forward);
+        static void changeImitationMode(const bool forward);
 
-        void changeGameModifiers();
+        static void changeGameModifiers();
 
-        void changeAwayMode();
+        static void changeAwayMode();
 
-        void setQuickDropCounter(const int n);
+        static void setQuickDropCounter(const int n);
 
-        std::string getMoveTypeString();
+        static std::string getMoveTypeString();
 
-        std::string getCrazyMoveTypeString();
+        static std::string getCrazyMoveTypeString();
 
-        std::string getMoveToTargetTypeString();
+        static std::string getMoveToTargetTypeString();
 
-        std::string getFollowModeString();
+        static std::string getFollowModeString();
 
-        std::string getAttackWeaponTypeString();
+        static std::string getAttackWeaponTypeString();
 
-        std::string getAttackTypeString();
+        static std::string getAttackTypeString();
 
-        std::string getQuickDropCounterString();
+        static std::string getQuickDropCounterString();
 
-        std::string getPickUpTypeString();
+        static std::string getPickUpTypeString();
 
-        std::string getMagicAttackTypeString();
+        static std::string getMagicAttackTypeString();
 
-        std::string getPvpAttackTypeString();
+        static std::string getPvpAttackTypeString();
 
-        std::string getImitationModeString();
+        static std::string getImitationModeString();
 
-        std::string getGameModifiersString();
+        static std::string getGameModifiersString();
 
-        std::string getMapDrawTypeString();
+        static std::string getMapDrawTypeString();
 
-        std::string getAwayModeString();
+        static std::string getAwayModeString();
 
-        std::string getCameraModeString();
+        static std::string getCameraModeString();
 
-        void resetModifiers();
+        static void resetModifiers();
 
     protected:
         static const char *getVarItem(const char *const *const arr,
@@ -108,6 +108,4 @@ class GameModifiers final
                                       const unsigned sz) A_WARN_UNUSED;
 };
 
-extern GameModifiers *modifiers;
-
 #endif  // GAMEMODIFIERS_H
-- 
cgit v1.2.3-60-g2f50