summaryrefslogtreecommitdiff
path: root/src/keyboardconfig.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2009-10-09 23:27:51 +0300
committerBlue <bluesansdouze@gmail.com>2010-01-08 23:24:04 +0100
commit104266da0f92ab2a765598dde59bf2e7f6426484 (patch)
treeab3f08a5b362b9a77978513bbea75081afdfb5c5 /src/keyboardconfig.h
parentc1ddf4c0840bb15016dc69af4a4751d09908393f (diff)
downloadmana-104266da0f92ab2a765598dde59bf2e7f6426484.tar.gz
mana-104266da0f92ab2a765598dde59bf2e7f6426484.tar.bz2
mana-104266da0f92ab2a765598dde59bf2e7f6426484.tar.xz
mana-104266da0f92ab2a765598dde59bf2e7f6426484.zip
Show first key binding conflict
Diffstat (limited to 'src/keyboardconfig.h')
-rw-r--r--src/keyboardconfig.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/keyboardconfig.h b/src/keyboardconfig.h
index b6a07f16..c6d0b723 100644
--- a/src/keyboardconfig.h
+++ b/src/keyboardconfig.h
@@ -139,6 +139,9 @@ class KeyboardConfig
*/
void refreshActiveKeys();
+ std::string getBindError()
+ { return mBindError; }
+
/**
* All the key functions.
* KEY_NO_VALUE is used in initialization, and should be unchanged.
@@ -225,6 +228,8 @@ class KeyboardConfig
KeyFunction mKey[KEY_TOTAL]; /**< Pointer to all the key data */
Uint8 *mActiveKeys; /**< Stores a list of all the keys */
+
+ std::string mBindError;
};
extern KeyboardConfig keyboard;