summaryrefslogtreecommitdiff
path: root/src/keyboardconfig.h
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-05-04 23:26:22 +0200
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-05-04 23:41:45 +0200
commit6cacaa3d7f55d91d8b7ca178f8595cc6c6b4383d (patch)
treea4ae355fe26eda518a5fd82c15347b6cfcf6b7f6 /src/keyboardconfig.h
parent1b06ec9f12e3fbfe6fbf6579fb64bb895464badb (diff)
downloadmana-6cacaa3d7f55d91d8b7ca178f8595cc6c6b4383d.tar.gz
mana-6cacaa3d7f55d91d8b7ca178f8595cc6c6b4383d.tar.bz2
mana-6cacaa3d7f55d91d8b7ca178f8595cc6c6b4383d.tar.xz
mana-6cacaa3d7f55d91d8b7ca178f8595cc6c6b4383d.zip
Replaced emote window with a new emote popup
The popup is meant to be temporary, showing the emote instantly when you click on it. It adapts nicely to show any number of emotes. I still need to add a better way of assigning emote shortcuts, since currently you can only change which emote is assigned to which shortcut by actually using it.
Diffstat (limited to 'src/keyboardconfig.h')
-rw-r--r--src/keyboardconfig.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/keyboardconfig.h b/src/keyboardconfig.h
index ecbe5de5..ebb94c89 100644
--- a/src/keyboardconfig.h
+++ b/src/keyboardconfig.h
@@ -132,7 +132,7 @@ class KeyboardConfig
/**
* Checks if the key is active, by providing the key function index.
*/
- bool isKeyActive(int index);
+ bool isKeyActive(int index) const;
/**
* Takes a snapshot of all the active keys.
@@ -188,7 +188,6 @@ class KeyboardConfig
KEY_WINDOW_SHORTCUT,
KEY_WINDOW_SETUP,
KEY_WINDOW_DEBUG,
- KEY_WINDOW_EMOTE,
KEY_WINDOW_EMOTE_SHORTCUT,
KEY_EMOTE_1,
KEY_EMOTE_2,