summaryrefslogtreecommitdiff
path: root/src/inputmanager.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-04-17 22:05:45 +0300
committerAndrei Karas <akaras@inbox.ru>2012-04-17 22:22:50 +0300
commit0f82a8b4a599fbeb2663680deb406bbc15a67576 (patch)
tree9db64099ec3fab34749cc3850242288b171574cf /src/inputmanager.h
parent693879649420c0997bfb29bea7f5752f6d9ac526 (diff)
downloadmv-0f82a8b4a599fbeb2663680deb406bbc15a67576.tar.gz
mv-0f82a8b4a599fbeb2663680deb406bbc15a67576.tar.bz2
mv-0f82a8b4a599fbeb2663680deb406bbc15a67576.tar.xz
mv-0f82a8b4a599fbeb2663680deb406bbc15a67576.zip
Move input condition mask to class member variable.
Diffstat (limited to 'src/inputmanager.h')
-rw-r--r--src/inputmanager.h10
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 */
};