diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-01-31 00:35:53 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-01-31 00:35:53 +0300 |
| commit | 32ddb3eb7bf5d25f3787258cb8b3ce0f0e3463c1 (patch) | |
| tree | b2dd6dcec673ad4f0fd68c4a1aa4729a864187e3 /src | |
| parent | d318a622d1f5458c9875605f7cc91302b0385e77 (diff) | |
| download | manaplus-32ddb3eb7bf5d25f3787258cb8b3ce0f0e3463c1.tar.gz manaplus-32ddb3eb7bf5d25f3787258cb8b3ce0f0e3463c1.tar.bz2 manaplus-32ddb3eb7bf5d25f3787258cb8b3ce0f0e3463c1.tar.xz manaplus-32ddb3eb7bf5d25f3787258cb8b3ce0f0e3463c1.zip | |
Extent max emotes count from 44 to 48 emotes.
Diffstat (limited to 'src')
| -rw-r--r-- | src/emoteshortcut.h | 2 | ||||
| -rw-r--r-- | src/gui/widgets/emoteshortcutcontainer.cpp | 2 | ||||
| -rw-r--r-- | src/keyboardconfig.cpp | 12 | ||||
| -rw-r--r-- | src/keyboardconfig.h | 4 |
4 files changed, 16 insertions, 4 deletions
diff --git a/src/emoteshortcut.h b/src/emoteshortcut.h index cc33f4177..d7f1e7b79 100644 --- a/src/emoteshortcut.h +++ b/src/emoteshortcut.h @@ -21,7 +21,7 @@ #ifndef EMOTESHORTCUT_H #define EMOTESHORTCUT_H -#define SHORTCUT_EMOTES 44 +#define SHORTCUT_EMOTES 48 /** * The class which keeps track of the emote shortcuts. diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp index e8d7bb7e3..794357275 100644 --- a/src/gui/widgets/emoteshortcutcontainer.cpp +++ b/src/gui/widgets/emoteshortcutcontainer.cpp @@ -43,7 +43,7 @@ #include "debug.h" -static const int MAX_ITEMS = 44; +static const int MAX_ITEMS = 48; EmoteShortcutContainer::EmoteShortcutContainer(): ShortcutContainer(), diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp index 49dd56b91..ea04a0e89 100644 --- a/src/keyboardconfig.cpp +++ b/src/keyboardconfig.cpp @@ -267,6 +267,14 @@ static KeyData const keyData[KeyboardConfig::KEY_TOTAL] = { KeyboardConfig::GRP_EMOTION}, {"keyEmoteShortcut44", SDLK_b, strprintf(N_("Emote Shortcut %d"), 44), KeyboardConfig::GRP_EMOTION}, + {"keyEmoteShortcut45", SDLK_n, strprintf(N_("Emote Shortcut %d"), 45), + KeyboardConfig::GRP_EMOTION}, + {"keyEmoteShortcut46", SDLK_m, strprintf(N_("Emote Shortcut %d"), 46), + KeyboardConfig::GRP_EMOTION}, + {"keyEmoteShortcut47", SDLK_COMMA, strprintf(N_("Emote Shortcut %d"), 47), + KeyboardConfig::GRP_EMOTION}, + {"keyEmoteShortcut48", SDLK_PERIOD, strprintf(N_("Emote Shortcut %d"), 48), + KeyboardConfig::GRP_EMOTION}, {"", 0, N_("Outfits Keys"), 0}, {"keyWearOutfit", SDLK_RCTRL, N_("Wear Outfit"), KeyboardConfig::GRP_DEFAULT}, @@ -360,7 +368,7 @@ void KeyboardConfig::init() mKey[i].value = KEY_NO_VALUE; mKey[i].grp = keyData[i].grp; } - for (int i = KEY_EMOTE_1; i <= KEY_EMOTE_44; i ++) + for (int i = KEY_EMOTE_1; i <= KEY_EMOTE_48; i ++) { mKey[i].caption = strprintf( _("Emote Shortcut %d"), i - KEY_EMOTE_1 + 1); @@ -460,7 +468,7 @@ int KeyboardConfig::getKeyIndex(int keyValue, int grp) const int KeyboardConfig::getKeyEmoteOffset(int keyValue) const { - for (int i = KEY_EMOTE_1; i <= KEY_EMOTE_44; i++) + for (int i = KEY_EMOTE_1; i <= KEY_EMOTE_48; i++) { if (keyValue == mKey[i].value) return 1 + i - KEY_EMOTE_1; diff --git a/src/keyboardconfig.h b/src/keyboardconfig.h index 33ce6ea49..1610c1ecd 100644 --- a/src/keyboardconfig.h +++ b/src/keyboardconfig.h @@ -278,6 +278,10 @@ class KeyboardConfig KEY_EMOTE_42, KEY_EMOTE_43, KEY_EMOTE_44, + KEY_EMOTE_45, + KEY_EMOTE_46, + KEY_EMOTE_47, + KEY_EMOTE_48, KEY_SEPARATOR5, KEY_WEAR_OUTFIT, KEY_COPY_OUTFIT, |