Move input condition mask to class member variable.

1 files changed, 6 insertions, 4 deletions

diff --git a/src/inputmanager.h b/src/inputmanager.h
index be0acc23e..b8114d906 100644
--- a/src/inputmanager.h
+++ b/src/inputmanager.h
@@ -88,9 +88,7 @@ class InputManager
 
         bool handleEvent(const SDL_Event &event);
 
-        int getInputConditionMask();
-
-        bool checkKey(const KeyData *key, int mask);
+        bool checkKey(const KeyData *key);
 
         void retrieve();
 
@@ -138,7 +136,7 @@ class InputManager
 
         void updateKeyActionMap(KeyToActionMap &actionMap, int type);
 
-        bool invokeKey(const KeyData *key, int keyNum, int mask);
+        bool invokeKey(const KeyData *key, int keyNum);
 
         bool handleAssignKey(const SDL_Event &event, int type);
 
@@ -148,11 +146,15 @@ class InputManager
 
         void update();
 
+        void updateConditionMask();
+
     protected:
         Setup_Input *mSetupInput;      /**< Reference to setup window */
 
         int mNewKeyIndex;              /**< Index of new key to be assigned */
 
+        int mMask;
+
         KeyFunction mKey[Input::KEY_TOTAL]; /**< Pointer to all the key data */
 };