summaryrefslogtreecommitdiff
path: root/src/keyboarddata.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-04-15 20:48:30 +0300
committerAndrei Karas <akaras@inbox.ru>2012-04-15 20:48:30 +0300
commit421376d12d1847246b5840460ea1643c5e22e650 (patch)
treeddb1b9a37a45206056a2e425cc5eabacc4ecce0a /src/keyboarddata.h
parent0ae57c3a2e3b8b8ae6bc3745f6e2fca2483e6899 (diff)
downloadmanaverse-421376d12d1847246b5840460ea1643c5e22e650.tar.gz
manaverse-421376d12d1847246b5840460ea1643c5e22e650.tar.bz2
manaverse-421376d12d1847246b5840460ea1643c5e22e650.tar.xz
manaverse-421376d12d1847246b5840460ea1643c5e22e650.zip
Simplify emote shortcuts logic.
Diffstat (limited to 'src/keyboarddata.h')
-rw-r--r--src/keyboarddata.h96
1 files changed, 48 insertions, 48 deletions
diff --git a/src/keyboarddata.h b/src/keyboarddata.h
index e975abe89..8c3df1878 100644
--- a/src/keyboarddata.h
+++ b/src/keyboarddata.h
@@ -530,336 +530,336 @@ static KeyData const keyData[Input::KEY_TOTAL] = {
INPUT_UNKNOWN, Input::KEY_NO_VALUE,
Input::GRP_EMOTION,
&ActionManager::emote,
- Input::KEY_NO_VALUE, 100,
+ Input::KEY_EMOTE, 100,
COND_GAME},
{"keyEmoteShortcut2",
INPUT_KEYBOARD, SDLK_2,
INPUT_UNKNOWN, Input::KEY_NO_VALUE,
Input::GRP_EMOTION,
&ActionManager::emote,
- Input::KEY_NO_VALUE, 100,
+ Input::KEY_EMOTE, 100,
COND_GAME},
{"keyEmoteShortcut3",
INPUT_KEYBOARD, SDLK_3,
INPUT_UNKNOWN, Input::KEY_NO_VALUE,
Input::GRP_EMOTION,
&ActionManager::emote,
- Input::KEY_NO_VALUE, 100,
+ Input::KEY_EMOTE, 100,
COND_GAME},
{"keyEmoteShortcut4",
INPUT_KEYBOARD, SDLK_4,
INPUT_UNKNOWN, Input::KEY_NO_VALUE,
Input::GRP_EMOTION,
&ActionManager::emote,
- Input::KEY_NO_VALUE, 100,
+ Input::KEY_EMOTE, 100,
COND_GAME},
{"keyEmoteShortcut5",
INPUT_KEYBOARD, SDLK_5,
INPUT_UNKNOWN, Input::KEY_NO_VALUE,
Input::GRP_EMOTION,
&ActionManager::emote,
- Input::KEY_NO_VALUE, 100,
+ Input::KEY_EMOTE, 100,
COND_GAME},
{"keyEmoteShortcut6",
INPUT_KEYBOARD, SDLK_6,
INPUT_UNKNOWN, Input::KEY_NO_VALUE,
Input::GRP_EMOTION,
&ActionManager::emote,
- Input::KEY_NO_VALUE, 100,
+ Input::KEY_EMOTE, 100,
COND_GAME},
{"keyEmoteShortcut7",
INPUT_KEYBOARD, SDLK_7,
INPUT_UNKNOWN, Input::KEY_NO_VALUE,
Input::GRP_EMOTION,
&ActionManager::emote,
- Input::KEY_NO_VALUE, 100,
+ Input::KEY_EMOTE, 100,
COND_GAME},
{"keyEmoteShortcut8",
INPUT_KEYBOARD, SDLK_8,
INPUT_UNKNOWN, Input::KEY_NO_VALUE,
Input::GRP_EMOTION,
&ActionManager::emote,
- Input::KEY_NO_VALUE, 100,
+ Input::KEY_EMOTE, 100,
COND_GAME},
{"keyEmoteShortcut9",
INPUT_KEYBOARD, SDLK_9,
INPUT_UNKNOWN, Input::KEY_NO_VALUE,
Input::GRP_EMOTION,
&ActionManager::emote,
- Input::KEY_NO_VALUE, 100,
+ Input::KEY_EMOTE, 100,
COND_GAME},
{"keyEmoteShortcut10",
INPUT_KEYBOARD, SDLK_0,
INPUT_UNKNOWN, Input::KEY_NO_VALUE,
Input::GRP_EMOTION,
&ActionManager::emote,
- Input::KEY_NO_VALUE, 100,
+ Input::KEY_EMOTE, 100,
COND_GAME},
{"keyEmoteShortcut11",
INPUT_KEYBOARD, SDLK_MINUS,
INPUT_UNKNOWN, Input::KEY_NO_VALUE,
Input::GRP_EMOTION,
&ActionManager::emote,
- Input::KEY_NO_VALUE, 100,
+ Input::KEY_EMOTE, 100,
COND_GAME},
{"keyEmoteShortcut12",
INPUT_KEYBOARD, SDLK_EQUALS,
INPUT_UNKNOWN, Input::KEY_NO_VALUE,
Input::GRP_EMOTION,
&ActionManager::emote,
- Input::KEY_NO_VALUE, 100,
+ Input::KEY_EMOTE, 100,
COND_GAME},
{"keyEmoteShortcut13",
INPUT_KEYBOARD, SDLK_BACKSPACE,
INPUT_UNKNOWN, Input::KEY_NO_VALUE,
Input::GRP_EMOTION,
&ActionManager::emote,
- Input::KEY_NO_VALUE, 100,
+ Input::KEY_EMOTE, 100,
COND_GAME},
{"keyEmoteShortcut14",
INPUT_KEYBOARD, SDLK_INSERT,
INPUT_UNKNOWN, Input::KEY_NO_VALUE,
Input::GRP_EMOTION,
&ActionManager::emote,
- Input::KEY_NO_VALUE, 100,
+ Input::KEY_EMOTE, 100,
COND_GAME},
{"keyEmoteShortcut15",
INPUT_KEYBOARD, SDLK_HOME,
INPUT_UNKNOWN, Input::KEY_NO_VALUE,
Input::GRP_EMOTION,
&ActionManager::emote,
- Input::KEY_NO_VALUE, 100,
+ Input::KEY_EMOTE, 100,
COND_GAME},
{"keyEmoteShortcut16",
INPUT_KEYBOARD, SDLK_q,
INPUT_UNKNOWN, Input::KEY_NO_VALUE,
Input::GRP_EMOTION,
&ActionManager::emote,
- Input::KEY_NO_VALUE, 100,
+ Input::KEY_EMOTE, 100,
COND_GAME},
{"keyEmoteShortcut17",
INPUT_KEYBOARD, SDLK_w,
INPUT_UNKNOWN, Input::KEY_NO_VALUE,
Input::GRP_EMOTION,
&ActionManager::emote,
- Input::KEY_NO_VALUE, 100,
+ Input::KEY_EMOTE, 100,
COND_GAME},
{"keyEmoteShortcut18",
INPUT_KEYBOARD, SDLK_e,
INPUT_UNKNOWN, Input::KEY_NO_VALUE,
Input::GRP_EMOTION,
&ActionManager::emote,
- Input::KEY_NO_VALUE, 100,
+ Input::KEY_EMOTE, 100,
COND_GAME},
{"keyEmoteShortcut19",
INPUT_KEYBOARD, SDLK_r,
INPUT_UNKNOWN, Input::KEY_NO_VALUE,
Input::GRP_EMOTION,
&ActionManager::emote,
- Input::KEY_NO_VALUE, 100,
+ Input::KEY_EMOTE, 100,
COND_GAME},
{"keyEmoteShortcut20",
INPUT_KEYBOARD, SDLK_t,
INPUT_UNKNOWN, Input::KEY_NO_VALUE,
Input::GRP_EMOTION,
&ActionManager::emote,
- Input::KEY_NO_VALUE, 100,
+ Input::KEY_EMOTE, 100,
COND_GAME},
{"keyEmoteShortcut21",
INPUT_KEYBOARD, SDLK_y,
INPUT_UNKNOWN, Input::KEY_NO_VALUE,
Input::GRP_EMOTION,
&ActionManager::emote,
- Input::KEY_NO_VALUE, 100,
+ Input::KEY_EMOTE, 100,
COND_GAME},
{"keyEmoteShortcut22",
INPUT_KEYBOARD, SDLK_u,
INPUT_UNKNOWN, Input::KEY_NO_VALUE,
Input::GRP_EMOTION,
&ActionManager::emote,
- Input::KEY_NO_VALUE, 100,
+ Input::KEY_EMOTE, 100,
COND_GAME},
{"keyEmoteShortcut23",
INPUT_KEYBOARD, SDLK_i,
INPUT_UNKNOWN, Input::KEY_NO_VALUE,
Input::GRP_EMOTION,
&ActionManager::emote,
- Input::KEY_NO_VALUE, 100,
+ Input::KEY_EMOTE, 100,
COND_GAME},
{"keyEmoteShortcut24",
INPUT_KEYBOARD, SDLK_o,
INPUT_UNKNOWN, Input::KEY_NO_VALUE,
Input::GRP_EMOTION,
&ActionManager::emote,
- Input::KEY_NO_VALUE, 100,
+ Input::KEY_EMOTE, 100,
COND_GAME},
{"keyEmoteShortcut25",
INPUT_KEYBOARD, SDLK_p,
INPUT_UNKNOWN, Input::KEY_NO_VALUE,
Input::GRP_EMOTION,
&ActionManager::emote,
- Input::KEY_NO_VALUE, 100,
+ Input::KEY_EMOTE, 100,
COND_GAME},
{"keyEmoteShortcut26",
INPUT_KEYBOARD, SDLK_LEFTBRACKET,
INPUT_UNKNOWN, Input::KEY_NO_VALUE,
Input::GRP_EMOTION,
&ActionManager::emote,
- Input::KEY_NO_VALUE, 100,
+ Input::KEY_EMOTE, 100,
COND_GAME},
{"keyEmoteShortcut27",
INPUT_KEYBOARD, SDLK_RIGHTBRACKET,
INPUT_UNKNOWN, Input::KEY_NO_VALUE,
Input::GRP_EMOTION,
&ActionManager::emote,
- Input::KEY_NO_VALUE, 100,
+ Input::KEY_EMOTE, 100,
COND_GAME},
{"keyEmoteShortcut28",
INPUT_KEYBOARD, SDLK_BACKSLASH,
INPUT_UNKNOWN, Input::KEY_NO_VALUE,
Input::GRP_EMOTION,
&ActionManager::emote,
- Input::KEY_NO_VALUE, 100,
+ Input::KEY_EMOTE, 100,
COND_GAME},
{"keyEmoteShortcut29",
INPUT_KEYBOARD, SDLK_a,
INPUT_UNKNOWN, Input::KEY_NO_VALUE,
Input::GRP_EMOTION,
&ActionManager::emote,
- Input::KEY_NO_VALUE, 100,
+ Input::KEY_EMOTE, 100,
COND_GAME},
{"keyEmoteShortcut30",
INPUT_KEYBOARD, SDLK_s,
INPUT_UNKNOWN, Input::KEY_NO_VALUE,
Input::GRP_EMOTION,
&ActionManager::emote,
- Input::KEY_NO_VALUE, 100,
+ Input::KEY_EMOTE, 100,
COND_GAME},
{"keyEmoteShortcut31",
INPUT_KEYBOARD, SDLK_d,
INPUT_UNKNOWN, Input::KEY_NO_VALUE,
Input::GRP_EMOTION,
&ActionManager::emote,
- Input::KEY_NO_VALUE, 100,
+ Input::KEY_EMOTE, 100,
COND_GAME},
{"keyEmoteShortcut32",
INPUT_KEYBOARD, SDLK_f,
INPUT_UNKNOWN, Input::KEY_NO_VALUE,
Input::GRP_EMOTION,
&ActionManager::emote,
- Input::KEY_NO_VALUE, 100,
+ Input::KEY_EMOTE, 100,
COND_GAME},
{"keyEmoteShortcut33",
INPUT_KEYBOARD, SDLK_g,
INPUT_UNKNOWN, Input::KEY_NO_VALUE,
Input::GRP_EMOTION,
&ActionManager::emote,
- Input::KEY_NO_VALUE, 100,
+ Input::KEY_EMOTE, 100,
COND_GAME},
{"keyEmoteShortcut34",
INPUT_KEYBOARD, SDLK_h,
INPUT_UNKNOWN, Input::KEY_NO_VALUE,
Input::GRP_EMOTION,
&ActionManager::emote,
- Input::KEY_NO_VALUE, 100,
+ Input::KEY_EMOTE, 100,
COND_GAME},
{"keyEmoteShortcut35",
INPUT_KEYBOARD, SDLK_j,
INPUT_UNKNOWN, Input::KEY_NO_VALUE,
Input::GRP_EMOTION,
&ActionManager::emote,
- Input::KEY_NO_VALUE, 100,
+ Input::KEY_EMOTE, 100,
COND_GAME},
{"keyEmoteShortcut36",
INPUT_KEYBOARD, SDLK_k,
INPUT_UNKNOWN, Input::KEY_NO_VALUE,
Input::GRP_EMOTION,
&ActionManager::emote,
- Input::KEY_NO_VALUE, 100,
+ Input::KEY_EMOTE, 100,
COND_GAME},
{"keyEmoteShortcut37",
INPUT_KEYBOARD, SDLK_l,
INPUT_UNKNOWN, Input::KEY_NO_VALUE,
Input::GRP_EMOTION,
&ActionManager::emote,
- Input::KEY_NO_VALUE, 100,
+ Input::KEY_EMOTE, 100,
COND_GAME},
{"keyEmoteShortcut38",
INPUT_KEYBOARD, SDLK_SEMICOLON,
INPUT_UNKNOWN, Input::KEY_NO_VALUE,
Input::GRP_EMOTION,
&ActionManager::emote,
- Input::KEY_NO_VALUE, 100,
+ Input::KEY_EMOTE, 100,
COND_GAME},
{"keyEmoteShortcut39",
INPUT_KEYBOARD, SDLK_QUOTE,
INPUT_UNKNOWN, Input::KEY_NO_VALUE,
Input::GRP_EMOTION,
&ActionManager::emote,
- Input::KEY_NO_VALUE, 100,
+ Input::KEY_EMOTE, 100,
COND_GAME},
{"keyEmoteShortcut40",
INPUT_KEYBOARD, SDLK_z,
INPUT_UNKNOWN, Input::KEY_NO_VALUE,
Input::GRP_EMOTION,
&ActionManager::emote,
- Input::KEY_NO_VALUE, 100,
+ Input::KEY_EMOTE, 100,
COND_GAME},
{"keyEmoteShortcut41",
INPUT_KEYBOARD, SDLK_x,
INPUT_UNKNOWN, Input::KEY_NO_VALUE,
Input::GRP_EMOTION,
&ActionManager::emote,
- Input::KEY_NO_VALUE, 100,
+ Input::KEY_EMOTE, 100,
COND_GAME},
{"keyEmoteShortcut42",
INPUT_KEYBOARD, SDLK_c,
INPUT_UNKNOWN, Input::KEY_NO_VALUE,
Input::GRP_EMOTION,
&ActionManager::emote,
- Input::KEY_NO_VALUE, 100,
+ Input::KEY_EMOTE, 100,
COND_GAME},
{"keyEmoteShortcut43",
INPUT_KEYBOARD, SDLK_v,
INPUT_UNKNOWN, Input::KEY_NO_VALUE,
Input::GRP_EMOTION,
&ActionManager::emote,
- Input::KEY_NO_VALUE, 100,
+ Input::KEY_EMOTE, 100,
COND_GAME},
{"keyEmoteShortcut44",
INPUT_KEYBOARD, SDLK_b,
INPUT_UNKNOWN, Input::KEY_NO_VALUE,
Input::GRP_EMOTION,
&ActionManager::emote,
- Input::KEY_NO_VALUE, 100,
+ Input::KEY_EMOTE, 100,
COND_GAME},
{"keyEmoteShortcut45",
INPUT_KEYBOARD, SDLK_n,
INPUT_UNKNOWN, Input::KEY_NO_VALUE,
Input::GRP_EMOTION,
&ActionManager::emote,
- Input::KEY_NO_VALUE, 100,
+ Input::KEY_EMOTE, 100,
COND_GAME},
{"keyEmoteShortcut46",
INPUT_KEYBOARD, SDLK_m,
INPUT_UNKNOWN, Input::KEY_NO_VALUE,
Input::GRP_EMOTION,
&ActionManager::emote,
- Input::KEY_NO_VALUE, 100,
+ Input::KEY_EMOTE, 100,
COND_GAME},
{"keyEmoteShortcut47",
INPUT_KEYBOARD, SDLK_COMMA,
INPUT_UNKNOWN, Input::KEY_NO_VALUE,
Input::GRP_EMOTION,
&ActionManager::emote,
- Input::KEY_NO_VALUE, 100,
+ Input::KEY_EMOTE, 100,
COND_GAME},
{"keyEmoteShortcut48",
INPUT_KEYBOARD, SDLK_PERIOD,
INPUT_UNKNOWN, Input::KEY_NO_VALUE,
Input::GRP_EMOTION,
&ActionManager::emote,
- Input::KEY_NO_VALUE, 100,
+ Input::KEY_EMOTE, 100,
COND_GAME},
{"keyWearOutfit",
INPUT_KEYBOARD, SDLK_RCTRL,
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-27 14:32:19 +0000