summaryrefslogtreecommitdiff
path: root/src/keyboardconfig.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-01-03 03:44:12 +0200
committerAndrei Karas <akaras@inbox.ru>2011-01-03 03:44:12 +0200
commitc595f66bc9031fd28e5146a7aaee686b4ecb9c67 (patch)
treecba70daa9c4f42299ec155d841e891f8e14dd127 /src/keyboardconfig.cpp
parentf29ee3f1f2b77534224078a80211cedbf82679e2 (diff)
downloadmanaverse-c595f66bc9031fd28e5146a7aaee686b4ecb9c67.tar.gz
manaverse-c595f66bc9031fd28e5146a7aaee686b4ecb9c67.tar.bz2
manaverse-c595f66bc9031fd28e5146a7aaee686b4ecb9c67.tar.xz
manaverse-c595f66bc9031fd28e5146a7aaee686b4ecb9c67.zip
Increase emotes count to 44 and fix new emotes.
Diffstat (limited to 'src/keyboardconfig.cpp')
-rw-r--r--src/keyboardconfig.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp
index fd3c3aa09..625e467fc 100644
--- a/src/keyboardconfig.cpp
+++ b/src/keyboardconfig.cpp
@@ -243,6 +243,10 @@ static KeyData const keyData[KeyboardConfig::KEY_TOTAL] = {
KeyboardConfig::GRP_EMOTION},
{"keyEmoteShortcut42", SDLK_c, strprintf(_("Emote Shortcut %d"), 42),
KeyboardConfig::GRP_EMOTION},
+ {"keyEmoteShortcut43", SDLK_v, strprintf(_("Emote Shortcut %d"), 43),
+ KeyboardConfig::GRP_EMOTION},
+ {"keyEmoteShortcut44", SDLK_b, strprintf(_("Emote Shortcut %d"), 44),
+ KeyboardConfig::GRP_EMOTION},
{"keyWearOutfit", SDLK_RCTRL, _("Wear Outfit"),
KeyboardConfig::GRP_DEFAULT},
{"keyCopyOutfit", SDLK_RALT, _("Copy Outfit"),
@@ -411,7 +415,7 @@ int KeyboardConfig::getKeyIndex(int keyValue, int grp) const
int KeyboardConfig::getKeyEmoteOffset(int keyValue) const
{
- for (int i = KEY_EMOTE_1; i <= KEY_EMOTE_42; i++)
+ for (int i = KEY_EMOTE_1; i <= KEY_EMOTE_44; i++)
{
if (keyValue == mKey[i].value)
return 1 + i - KEY_EMOTE_1;