summaryrefslogtreecommitdiff
path: root/src/input
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-12-30 18:08:32 +0300
committerAndrei Karas <akaras@inbox.ru>2014-12-30 23:07:35 +0300
commitd804ef6c9bd8bb3620186f593cee3195a4a42c18 (patch)
tree9073beeaf099176b58cb6c55b5eef3fd76cf2e7b /src/input
parentecbd0c78c59a5660189e3ee03bc9cd545fb12f46 (diff)
downloadplus-d804ef6c9bd8bb3620186f593cee3195a4a42c18.tar.gz
plus-d804ef6c9bd8bb3620186f593cee3195a4a42c18.tar.bz2
plus-d804ef6c9bd8bb3620186f593cee3195a4a42c18.tar.xz
plus-d804ef6c9bd8bb3620186f593cee3195a4a42c18.zip
Shorted inputactionmap.h file.
Diffstat (limited to 'src/input')
-rw-r--r--src/input/inputactionmap.h2258
1 files changed, 854 insertions, 1404 deletions
diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h
index 8c09001a2..ae69a7ebb 100644
--- a/src/input/inputactionmap.h
+++ b/src/input/inputactionmap.h
@@ -47,11 +47,22 @@
#include "localconsts.h"
+#define defaultAction(name) \
+ InputType::UNKNOWN, InputAction::NO_VALUE, \
+ InputType::UNKNOWN, InputAction::NO_VALUE, \
+ Input::GRP_DEFAULT, \
+ name, \
+ InputAction::NO_VALUE, 50
+
+#define addKey(name) InputType::KEYBOARD, name
+#define emptyKey InputType::UNKNOWN, InputAction::NO_VALUE
+#define joystickButton(num) InputType::JOYSTICK, num
+
// keyData must be in same order as enum keyAction.
static const InputActionData inputActionData[InputAction::TOTAL] = {
{"keyMoveUp",
- InputType::KEYBOARD, SDLK_UP,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_UP),
+ emptyKey,
Input::GRP_DEFAULT,
&Actions::moveUp,
InputAction::NO_VALUE, 50,
@@ -59,8 +70,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyMoveDown",
- InputType::KEYBOARD, SDLK_DOWN,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_DOWN),
+ emptyKey,
Input::GRP_DEFAULT,
&Actions::moveDown,
InputAction::NO_VALUE, 50,
@@ -68,8 +79,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyMoveLeft",
- InputType::KEYBOARD, SDLK_LEFT,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_LEFT),
+ emptyKey,
Input::GRP_DEFAULT,
&Actions::moveLeft,
InputAction::NO_VALUE, 50,
@@ -77,8 +88,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyMoveRight",
- InputType::KEYBOARD, SDLK_RIGHT,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_RIGHT),
+ emptyKey,
Input::GRP_DEFAULT,
&Actions::moveRight,
InputAction::NO_VALUE, 50,
@@ -86,8 +97,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyAttack",
- InputType::KEYBOARD, SDLK_x,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_x),
+ emptyKey,
Input::GRP_DEFAULT | Input::GRP_REPEAT,
&Actions::attack,
InputAction::NO_VALUE, 50,
@@ -96,8 +107,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"attack",
false},
{"keyTargetAttack",
- InputType::KEYBOARD, SDLK_LCTRL,
- InputType::JOYSTICK, 0,
+ addKey(SDLK_LCTRL),
+ joystickButton(0),
Input::GRP_DEFAULT,
&Actions::targetAttack,
InputAction::NO_VALUE, 50,
@@ -106,8 +117,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"targetattack",
false},
{"keyMoveToTarget",
- InputType::KEYBOARD, SDLK_v,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_v),
+ emptyKey,
Input::GRP_DEFAULT,
&Actions::moveToTarget,
InputAction::NO_VALUE, 50,
@@ -115,8 +126,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"movetotarget",
false},
{"keyChangeMoveToTarget",
- InputType::KEYBOARD, SDLK_PERIOD,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_PERIOD),
+ emptyKey,
Input::GRP_DEFAULT,
&Actions::changeMoveToTarget,
InputAction::NO_VALUE, 50,
@@ -125,8 +136,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyMoveToHome",
- InputType::KEYBOARD, SDLK_d,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_d),
+ emptyKey,
Input::GRP_DEFAULT,
&Actions::moveToHome,
InputAction::NO_VALUE, 50,
@@ -134,8 +145,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"movetohome",
false},
{"keySetHome",
- InputType::KEYBOARD, SDLK_KP5,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_KP5),
+ emptyKey,
Input::GRP_DEFAULT,
&Actions::setHome,
InputAction::NO_VALUE, 50,
@@ -143,8 +154,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"sethome",
false},
{"keyMoveToPoint",
- InputType::KEYBOARD, SDLK_RSHIFT,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_RSHIFT),
+ emptyKey,
Input::GRP_DEFAULT,
nullptr,
InputAction::NO_VALUE, 50,
@@ -152,8 +163,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyTalk",
- InputType::KEYBOARD, SDLK_t,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_t),
+ emptyKey,
Input::GRP_DEFAULT,
&Actions::talk,
InputAction::NO_VALUE, 50,
@@ -161,8 +172,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"talk",
false},
{"keyTarget",
- InputType::KEYBOARD, SDLK_LSHIFT,
- InputType::JOYSTICK, 4,
+ addKey(SDLK_LSHIFT),
+ joystickButton(4),
Input::GRP_DEFAULT,
&Actions::stopAttack,
InputAction::NO_VALUE, 50,
@@ -170,17 +181,13 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"stopattack",
false},
{"keyUnTarget",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::untarget,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::untarget),
InputCondition::GAME,
"untarget",
false},
{"keyTargetMonster",
- InputType::KEYBOARD, SDLK_a,
- InputType::JOYSTICK, 3,
+ addKey(SDLK_a),
+ joystickButton(3),
Input::GRP_DEFAULT | Input::GRP_REPEAT,
&Actions::targetMonster,
InputAction::NO_VALUE, 50,
@@ -189,8 +196,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"targetmonster",
false},
{"keyTargetNPC",
- InputType::KEYBOARD, SDLK_n,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_n),
+ emptyKey,
Input::GRP_DEFAULT,
&Actions::targetNPC,
InputAction::NO_VALUE, 50,
@@ -198,8 +205,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"targetnpc",
false},
{"keyTargetPlayer",
- InputType::KEYBOARD, SDLK_q,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_q),
+ emptyKey,
Input::GRP_DEFAULT,
&Actions::targetPlayer,
InputAction::NO_VALUE, 50,
@@ -207,8 +214,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"targetplayer",
false},
{"keyPickup",
- InputType::KEYBOARD, SDLK_z,
- InputType::JOYSTICK, 1,
+ addKey(SDLK_z),
+ joystickButton(1),
Input::GRP_DEFAULT,
&Actions::pickup,
InputAction::NO_VALUE, 50,
@@ -216,8 +223,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"pickup",
false},
{"keyChangePickupType",
- InputType::KEYBOARD, SDLK_o,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_o),
+ emptyKey,
Input::GRP_DEFAULT,
&Actions::changePickupType,
InputAction::NO_VALUE, 50,
@@ -226,8 +233,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyHideWindows",
- InputType::KEYBOARD, SDLK_h,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_h),
+ emptyKey,
Input::GRP_DEFAULT | Input::GRP_GUI,
&Actions::hideWindows,
InputAction::NO_VALUE, 50,
@@ -235,8 +242,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"hidewindows",
false},
{"keyBeingSit",
- InputType::KEYBOARD, SDLK_s,
- InputType::JOYSTICK, 2,
+ addKey(SDLK_s),
+ joystickButton(2),
Input::GRP_DEFAULT,
&Actions::sit,
InputAction::NO_VALUE, 50,
@@ -244,8 +251,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"sit",
false},
{"keyScreenshot",
- InputType::KEYBOARD, SDLK_p,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_p),
+ emptyKey,
Input::GRP_DEFAULT,
&Actions::screenshot,
InputAction::NO_VALUE, 50,
@@ -253,8 +260,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"screenshot",
false},
{"keyTrade",
- InputType::KEYBOARD, SDLK_r,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_r),
+ emptyKey,
Input::GRP_DEFAULT,
&Actions::changeTrade,
InputAction::NO_VALUE, 50,
@@ -262,8 +269,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"changetrade",
false},
{"keyPathfind",
- InputType::KEYBOARD, SDLK_f,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_f),
+ emptyKey,
Input::GRP_DEFAULT,
&Actions::changeMapMode,
InputAction::NO_VALUE, 50,
@@ -272,8 +279,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyOK",
- InputType::KEYBOARD, SDLK_SPACE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_SPACE),
+ emptyKey,
Input::GRP_DEFAULT | Input::GRP_GUI,
&Actions::ok,
InputAction::NO_VALUE, 50,
@@ -282,11 +289,11 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyQuit",
- InputType::KEYBOARD, SDLK_ESCAPE,
+ addKey(SDLK_ESCAPE),
#if defined(USE_SDL2) && defined(ANDROID)
- InputType::KEYBOARD, SDLK_AC_BACK,
+ addKey(SDLK_AC_BACK),
#else
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ emptyKey,
#endif
Input::GRP_DEFAULT,
&Actions::quit,
@@ -295,8 +302,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"quit",
false},
{"keyShortcutsKey",
- InputType::KEYBOARD, SDLK_MENU,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_MENU),
+ emptyKey,
Input::GRP_DEFAULT,
nullptr,
InputAction::NO_VALUE, 50,
@@ -304,8 +311,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyShortcut1",
- InputType::KEYBOARD, SDLK_1,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_1),
+ emptyKey,
Input::GRP_DEFAULT,
&Actions::shortcut,
InputAction::NO_VALUE, 50,
@@ -313,8 +320,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyShortcut2",
- InputType::KEYBOARD, SDLK_2,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_2),
+ emptyKey,
Input::GRP_DEFAULT,
&Actions::shortcut,
InputAction::NO_VALUE, 50,
@@ -322,8 +329,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyShortcut3",
- InputType::KEYBOARD, SDLK_3,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_3),
+ emptyKey,
Input::GRP_DEFAULT,
&Actions::shortcut,
InputAction::NO_VALUE, 50,
@@ -331,8 +338,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyShortcut4",
- InputType::KEYBOARD, SDLK_4,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_4),
+ emptyKey,
Input::GRP_DEFAULT,
&Actions::shortcut,
InputAction::NO_VALUE, 50,
@@ -340,8 +347,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyShortcut5",
- InputType::KEYBOARD, SDLK_5,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_5),
+ emptyKey,
Input::GRP_DEFAULT,
&Actions::shortcut,
InputAction::NO_VALUE, 50,
@@ -349,8 +356,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyShortcut6",
- InputType::KEYBOARD, SDLK_6,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_6),
+ emptyKey,
Input::GRP_DEFAULT,
&Actions::shortcut,
InputAction::NO_VALUE, 50,
@@ -358,8 +365,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyShortcut7",
- InputType::KEYBOARD, SDLK_7,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_7),
+ emptyKey,
Input::GRP_DEFAULT,
&Actions::shortcut,
InputAction::NO_VALUE, 50,
@@ -367,8 +374,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyShortcut8",
- InputType::KEYBOARD, SDLK_8,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_8),
+ emptyKey,
Input::GRP_DEFAULT,
&Actions::shortcut,
InputAction::NO_VALUE, 50,
@@ -376,8 +383,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyShortcut9",
- InputType::KEYBOARD, SDLK_9,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_9),
+ emptyKey,
Input::GRP_DEFAULT,
&Actions::shortcut,
InputAction::NO_VALUE, 50,
@@ -385,8 +392,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyShortcut10",
- InputType::KEYBOARD, SDLK_0,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_0),
+ emptyKey,
Input::GRP_DEFAULT,
&Actions::shortcut,
InputAction::NO_VALUE, 50,
@@ -394,8 +401,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyShortcut11",
- InputType::KEYBOARD, SDLK_MINUS,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_MINUS),
+ emptyKey,
Input::GRP_DEFAULT,
&Actions::shortcut,
InputAction::NO_VALUE, 50,
@@ -403,8 +410,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyShortcut12",
- InputType::KEYBOARD, SDLK_EQUALS,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_EQUALS),
+ emptyKey,
Input::GRP_DEFAULT,
&Actions::shortcut,
InputAction::NO_VALUE, 50,
@@ -412,8 +419,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyShortcut13",
- InputType::KEYBOARD, SDLK_BACKSPACE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_BACKSPACE),
+ emptyKey,
Input::GRP_DEFAULT,
&Actions::shortcut,
InputAction::NO_VALUE, 50,
@@ -421,8 +428,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyShortcut14",
- InputType::KEYBOARD, SDLK_INSERT,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_INSERT),
+ emptyKey,
Input::GRP_DEFAULT,
&Actions::shortcut,
InputAction::NO_VALUE, 50,
@@ -430,8 +437,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyShortcut15",
- InputType::KEYBOARD, SDLK_HOME,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_HOME),
+ emptyKey,
Input::GRP_DEFAULT,
&Actions::shortcut,
InputAction::NO_VALUE, 50,
@@ -439,53 +446,33 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyShortcut16",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::shortcut,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::shortcut),
InputCondition::SHORTCUT,
"",
false},
{"keyShortcut17",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::shortcut,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::shortcut),
InputCondition::SHORTCUT,
"",
false},
{"keyShortcut18",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::shortcut,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::shortcut),
InputCondition::SHORTCUT,
"",
false},
{"keyShortcut19",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::shortcut,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::shortcut),
InputCondition::SHORTCUT,
"",
false},
{"keyShortcut20",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::shortcut,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::shortcut),
InputCondition::SHORTCUT,
"",
false},
{"keyWindowHelp",
- InputType::KEYBOARD, SDLK_F1,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_F1),
+ emptyKey,
Input::GRP_DEFAULT | Input::GRP_GUI,
&Actions::helpWindowShow,
InputAction::NO_VALUE, 50,
@@ -493,8 +480,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"help|openhelp",
false},
{"keyWindowStatus",
- InputType::KEYBOARD, SDLK_F2,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_F2),
+ emptyKey,
Input::GRP_DEFAULT | Input::GRP_GUI,
&Actions::statusWindowShow,
InputAction::NO_VALUE, 50,
@@ -502,8 +489,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"status|openstatus",
false},
{"keyWindowInventory",
- InputType::KEYBOARD, SDLK_F3,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_F3),
+ emptyKey,
Input::GRP_DEFAULT | Input::GRP_GUI,
&Actions::inventoryWindowShow,
InputAction::NO_VALUE, 50,
@@ -511,8 +498,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"inventory|openinventory",
false},
{"keyWindowEquipment",
- InputType::KEYBOARD, SDLK_F4,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_F4),
+ emptyKey,
Input::GRP_DEFAULT | Input::GRP_GUI,
&Actions::equipmentWindowShow,
InputAction::NO_VALUE, 50,
@@ -520,8 +507,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"equipment|openequipment",
false},
{"keyWindowSkill",
- InputType::KEYBOARD, SDLK_F5,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_F5),
+ emptyKey,
Input::GRP_DEFAULT | Input::GRP_GUI,
&Actions::skillDialogShow,
InputAction::NO_VALUE, 50,
@@ -529,8 +516,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"skill|skills|openskills",
false},
{"keyWindowMinimap",
- InputType::KEYBOARD, SDLK_F6,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_F6),
+ emptyKey,
Input::GRP_DEFAULT | Input::GRP_GUI,
&Actions::minimapWindowShow,
InputAction::NO_VALUE, 50,
@@ -538,8 +525,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"minimap|openminimap",
false},
{"keyWindowChat",
- InputType::KEYBOARD, SDLK_F7,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_F7),
+ emptyKey,
Input::GRP_DEFAULT | Input::GRP_GUI,
&Actions::chatWindowShow,
InputAction::NO_VALUE, 50,
@@ -547,8 +534,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"openchat",
false},
{"keyWindowShortcut",
- InputType::KEYBOARD, SDLK_F8,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_F8),
+ emptyKey,
Input::GRP_DEFAULT | Input::GRP_GUI,
&Actions::shortcutWindowShow,
InputAction::NO_VALUE, 50,
@@ -556,8 +543,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"openshortcut|openshortcuts",
false},
{"keyWindowSetup",
- InputType::KEYBOARD, SDLK_F9,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_F9),
+ emptyKey,
Input::GRP_DEFAULT | Input::GRP_GUI,
&Actions::setupWindowShow,
InputAction::NO_VALUE, 50,
@@ -566,8 +553,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"setup|opensetup",
false},
{"keyWindowDebug",
- InputType::KEYBOARD, SDLK_F10,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_F10),
+ emptyKey,
Input::GRP_DEFAULT | Input::GRP_GUI,
&Actions::debugWindowShow,
InputAction::NO_VALUE, 50,
@@ -575,8 +562,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"debug|opendebug",
false},
{"keyWindowSocial",
- InputType::KEYBOARD, SDLK_F11,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_F11),
+ emptyKey,
Input::GRP_DEFAULT | Input::GRP_GUI,
&Actions::socialWindowShow,
InputAction::NO_VALUE, 50,
@@ -584,8 +571,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"social|opensocial",
false},
{"keyWindowEmoteBar",
- InputType::KEYBOARD, SDLK_F12,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_F12),
+ emptyKey,
Input::GRP_DEFAULT | Input::GRP_GUI,
&Actions::emoteShortcutWindowShow,
InputAction::NO_VALUE, 50,
@@ -593,8 +580,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"emotes|openemotes",
false},
{"keyWindowOutfit",
- InputType::KEYBOARD, SDLK_BACKQUOTE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_BACKQUOTE),
+ emptyKey,
Input::GRP_DEFAULT | Input::GRP_GUI,
&Actions::outfitWindowShow,
InputAction::NO_VALUE, 50,
@@ -602,8 +589,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"openoutfit|openoutfits",
false},
{"keyWindowShop",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ emptyKey,
+ emptyKey,
Input::GRP_DEFAULT | Input::GRP_GUI,
&Actions::shopWindowShow,
InputAction::NO_VALUE, 50,
@@ -611,8 +598,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"shop|openshop",
false},
{"keyWindowDrop",
- InputType::KEYBOARD, SDLK_w,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_w),
+ emptyKey,
Input::GRP_DEFAULT | Input::GRP_GUI,
&Actions::dropShortcutWindowShow,
InputAction::NO_VALUE, 50,
@@ -620,8 +607,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"opendrop",
false},
{"keyWindowKills",
- InputType::KEYBOARD, SDLK_e,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_e),
+ emptyKey,
Input::GRP_DEFAULT | Input::GRP_GUI,
&Actions::killStatsWindowShow,
InputAction::NO_VALUE, 50,
@@ -629,8 +616,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"kills|openkills",
false},
{"keyWindowSpells",
- InputType::KEYBOARD, SDLK_j,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_j),
+ emptyKey,
Input::GRP_DEFAULT | Input::GRP_GUI,
&Actions::spellShortcutWindowShow,
InputAction::NO_VALUE, 50,
@@ -638,8 +625,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"spells|openspells",
false},
{"keyWindowBotChecker",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ emptyKey,
+ emptyKey,
Input::GRP_DEFAULT | Input::GRP_GUI,
&Actions::botcheckerWindowShow,
InputAction::NO_VALUE, 50,
@@ -647,8 +634,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"botchecker|openbotchecker",
false},
{"keyWindowOnline",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ emptyKey,
+ emptyKey,
Input::GRP_DEFAULT | Input::GRP_GUI,
&Actions::whoIsOnlineWindowShow,
InputAction::NO_VALUE, 50,
@@ -656,8 +643,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"online|openonline",
false},
{"keyWindowDidYouKnow",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ emptyKey,
+ emptyKey,
Input::GRP_DEFAULT | Input::GRP_GUI,
&Actions::didYouKnowWindowShow,
InputAction::NO_VALUE, 50,
@@ -665,8 +652,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"didyouknow|opendidyouknow",
false},
{"keyWindowQuests",
- InputType::KEYBOARD, SDLK_LEFTBRACKET,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_LEFTBRACKET),
+ emptyKey,
Input::GRP_DEFAULT | Input::GRP_GUI,
&Actions::questsWindowShow,
InputAction::NO_VALUE, 50,
@@ -674,8 +661,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"quests|openquests",
false},
{"keySocialPrevTab",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ emptyKey,
+ emptyKey,
Input::GRP_DEFAULT | Input::GRP_GUI,
&Actions::prevSocialTab,
InputAction::NO_VALUE, 50,
@@ -683,8 +670,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"prevsocialtab",
false},
{"keySocialNextTab",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ emptyKey,
+ emptyKey,
Input::GRP_DEFAULT | Input::GRP_GUI,
&Actions::nextSocialTab,
InputAction::NO_VALUE, 50,
@@ -692,8 +679,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"nextsocialtab",
false},
{"keySmilie",
- InputType::KEYBOARD, SDLK_LALT,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_LALT),
+ emptyKey,
Input::GRP_DEFAULT,
nullptr,
InputAction::NO_VALUE, 50,
@@ -701,8 +688,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyEmoteShortcut1",
- InputType::KEYBOARD, SDLK_1,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_1),
+ emptyKey,
Input::GRP_EMOTION,
&Actions::emote,
InputAction::EMOTE, 100,
@@ -710,8 +697,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyEmoteShortcut2",
- InputType::KEYBOARD, SDLK_2,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_2),
+ emptyKey,
Input::GRP_EMOTION,
&Actions::emote,
InputAction::EMOTE, 100,
@@ -719,8 +706,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyEmoteShortcut3",
- InputType::KEYBOARD, SDLK_3,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_3),
+ emptyKey,
Input::GRP_EMOTION,
&Actions::emote,
InputAction::EMOTE, 100,
@@ -728,8 +715,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyEmoteShortcut4",
- InputType::KEYBOARD, SDLK_4,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_4),
+ emptyKey,
Input::GRP_EMOTION,
&Actions::emote,
InputAction::EMOTE, 100,
@@ -737,8 +724,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyEmoteShortcut5",
- InputType::KEYBOARD, SDLK_5,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_5),
+ emptyKey,
Input::GRP_EMOTION,
&Actions::emote,
InputAction::EMOTE, 100,
@@ -746,8 +733,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyEmoteShortcut6",
- InputType::KEYBOARD, SDLK_6,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_6),
+ emptyKey,
Input::GRP_EMOTION,
&Actions::emote,
InputAction::EMOTE, 100,
@@ -755,8 +742,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyEmoteShortcut7",
- InputType::KEYBOARD, SDLK_7,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_7),
+ emptyKey,
Input::GRP_EMOTION,
&Actions::emote,
InputAction::EMOTE, 100,
@@ -764,8 +751,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyEmoteShortcut8",
- InputType::KEYBOARD, SDLK_8,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_8),
+ emptyKey,
Input::GRP_EMOTION,
&Actions::emote,
InputAction::EMOTE, 100,
@@ -773,8 +760,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyEmoteShortcut9",
- InputType::KEYBOARD, SDLK_9,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_9),
+ emptyKey,
Input::GRP_EMOTION,
&Actions::emote,
InputAction::EMOTE, 100,
@@ -782,8 +769,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyEmoteShortcut10",
- InputType::KEYBOARD, SDLK_0,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_0),
+ emptyKey,
Input::GRP_EMOTION,
&Actions::emote,
InputAction::EMOTE, 100,
@@ -791,8 +778,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyEmoteShortcut11",
- InputType::KEYBOARD, SDLK_MINUS,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_MINUS),
+ emptyKey,
Input::GRP_EMOTION,
&Actions::emote,
InputAction::EMOTE, 100,
@@ -800,8 +787,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyEmoteShortcut12",
- InputType::KEYBOARD, SDLK_EQUALS,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_EQUALS),
+ emptyKey,
Input::GRP_EMOTION,
&Actions::emote,
InputAction::EMOTE, 100,
@@ -809,8 +796,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyEmoteShortcut13",
- InputType::KEYBOARD, SDLK_BACKSPACE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_BACKSPACE),
+ emptyKey,
Input::GRP_EMOTION,
&Actions::emote,
InputAction::EMOTE, 100,
@@ -818,8 +805,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyEmoteShortcut14",
- InputType::KEYBOARD, SDLK_INSERT,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_INSERT),
+ emptyKey,
Input::GRP_EMOTION,
&Actions::emote,
InputAction::EMOTE, 100,
@@ -827,8 +814,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyEmoteShortcut15",
- InputType::KEYBOARD, SDLK_HOME,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_HOME),
+ emptyKey,
Input::GRP_EMOTION,
&Actions::emote,
InputAction::EMOTE, 100,
@@ -836,8 +823,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyEmoteShortcut16",
- InputType::KEYBOARD, SDLK_q,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_q),
+ emptyKey,
Input::GRP_EMOTION,
&Actions::emote,
InputAction::EMOTE, 100,
@@ -845,8 +832,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyEmoteShortcut17",
- InputType::KEYBOARD, SDLK_w,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_w),
+ emptyKey,
Input::GRP_EMOTION,
&Actions::emote,
InputAction::EMOTE, 100,
@@ -854,8 +841,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyEmoteShortcut18",
- InputType::KEYBOARD, SDLK_e,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_e),
+ emptyKey,
Input::GRP_EMOTION,
&Actions::emote,
InputAction::EMOTE, 100,
@@ -863,8 +850,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyEmoteShortcut19",
- InputType::KEYBOARD, SDLK_r,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_r),
+ emptyKey,
Input::GRP_EMOTION,
&Actions::emote,
InputAction::EMOTE, 100,
@@ -872,8 +859,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyEmoteShortcut20",
- InputType::KEYBOARD, SDLK_t,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_t),
+ emptyKey,
Input::GRP_EMOTION,
&Actions::emote,
InputAction::EMOTE, 100,
@@ -881,8 +868,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyEmoteShortcut21",
- InputType::KEYBOARD, SDLK_y,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_y),
+ emptyKey,
Input::GRP_EMOTION,
&Actions::emote,
InputAction::EMOTE, 100,
@@ -890,8 +877,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyEmoteShortcut22",
- InputType::KEYBOARD, SDLK_u,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_u),
+ emptyKey,
Input::GRP_EMOTION,
&Actions::emote,
InputAction::EMOTE, 100,
@@ -899,8 +886,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyEmoteShortcut23",
- InputType::KEYBOARD, SDLK_i,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_i),
+ emptyKey,
Input::GRP_EMOTION,
&Actions::emote,
InputAction::EMOTE, 100,
@@ -908,8 +895,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyEmoteShortcut24",
- InputType::KEYBOARD, SDLK_o,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_o),
+ emptyKey,
Input::GRP_EMOTION,
&Actions::emote,
InputAction::EMOTE, 100,
@@ -917,8 +904,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyEmoteShortcut25",
- InputType::KEYBOARD, SDLK_p,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_p),
+ emptyKey,
Input::GRP_EMOTION,
&Actions::emote,
InputAction::EMOTE, 100,
@@ -926,8 +913,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyEmoteShortcut26",
- InputType::KEYBOARD, SDLK_LEFTBRACKET,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_LEFTBRACKET),
+ emptyKey,
Input::GRP_EMOTION,
&Actions::emote,
InputAction::EMOTE, 100,
@@ -935,8 +922,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyEmoteShortcut27",
- InputType::KEYBOARD, SDLK_RIGHTBRACKET,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_RIGHTBRACKET),
+ emptyKey,
Input::GRP_EMOTION,
&Actions::emote,
InputAction::EMOTE, 100,
@@ -944,8 +931,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyEmoteShortcut28",
- InputType::KEYBOARD, SDLK_BACKSLASH,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_BACKSLASH),
+ emptyKey,
Input::GRP_EMOTION,
&Actions::emote,
InputAction::EMOTE, 100,
@@ -953,8 +940,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyEmoteShortcut29",
- InputType::KEYBOARD, SDLK_a,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_a),
+ emptyKey,
Input::GRP_EMOTION,
&Actions::emote,
InputAction::EMOTE, 100,
@@ -962,8 +949,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyEmoteShortcut30",
- InputType::KEYBOARD, SDLK_s,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_s),
+ emptyKey,
Input::GRP_EMOTION,
&Actions::emote,
InputAction::EMOTE, 100,
@@ -971,8 +958,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyEmoteShortcut31",
- InputType::KEYBOARD, SDLK_d,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_d),
+ emptyKey,
Input::GRP_EMOTION,
&Actions::emote,
InputAction::EMOTE, 100,
@@ -980,8 +967,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyEmoteShortcut32",
- InputType::KEYBOARD, SDLK_f,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_f),
+ emptyKey,
Input::GRP_EMOTION,
&Actions::emote,
InputAction::EMOTE, 100,
@@ -989,8 +976,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyEmoteShortcut33",
- InputType::KEYBOARD, SDLK_g,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_g),
+ emptyKey,
Input::GRP_EMOTION,
&Actions::emote,
InputAction::EMOTE, 100,
@@ -998,8 +985,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyEmoteShortcut34",
- InputType::KEYBOARD, SDLK_h,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_h),
+ emptyKey,
Input::GRP_EMOTION,
&Actions::emote,
InputAction::EMOTE, 100,
@@ -1007,8 +994,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyEmoteShortcut35",
- InputType::KEYBOARD, SDLK_j,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_j),
+ emptyKey,
Input::GRP_EMOTION,
&Actions::emote,
InputAction::EMOTE, 100,
@@ -1016,8 +1003,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyEmoteShortcut36",
- InputType::KEYBOARD, SDLK_k,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_k),
+ emptyKey,
Input::GRP_EMOTION,
&Actions::emote,
InputAction::EMOTE, 100,
@@ -1025,8 +1012,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyEmoteShortcut37",
- InputType::KEYBOARD, SDLK_l,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_l),
+ emptyKey,
Input::GRP_EMOTION,
&Actions::emote,
InputAction::EMOTE, 100,
@@ -1034,8 +1021,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyEmoteShortcut38",
- InputType::KEYBOARD, SDLK_SEMICOLON,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_SEMICOLON),
+ emptyKey,
Input::GRP_EMOTION,
&Actions::emote,
InputAction::EMOTE, 100,
@@ -1043,8 +1030,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyEmoteShortcut39",
- InputType::KEYBOARD, SDLK_QUOTE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_QUOTE),
+ emptyKey,
Input::GRP_EMOTION,
&Actions::emote,
InputAction::EMOTE, 100,
@@ -1052,8 +1039,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyEmoteShortcut40",
- InputType::KEYBOARD, SDLK_z,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_z),
+ emptyKey,
Input::GRP_EMOTION,
&Actions::emote,
InputAction::EMOTE, 100,
@@ -1061,8 +1048,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyEmoteShortcut41",
- InputType::KEYBOARD, SDLK_x,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_x),
+ emptyKey,
Input::GRP_EMOTION,
&Actions::emote,
InputAction::EMOTE, 100,
@@ -1070,8 +1057,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyEmoteShortcut42",
- InputType::KEYBOARD, SDLK_c,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_c),
+ emptyKey,
Input::GRP_EMOTION,
&Actions::emote,
InputAction::EMOTE, 100,
@@ -1079,8 +1066,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyEmoteShortcut43",
- InputType::KEYBOARD, SDLK_v,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_v),
+ emptyKey,
Input::GRP_EMOTION,
&Actions::emote,
InputAction::EMOTE, 100,
@@ -1088,8 +1075,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyEmoteShortcut44",
- InputType::KEYBOARD, SDLK_b,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_b),
+ emptyKey,
Input::GRP_EMOTION,
&Actions::emote,
InputAction::EMOTE, 100,
@@ -1097,8 +1084,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyEmoteShortcut45",
- InputType::KEYBOARD, SDLK_n,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_n),
+ emptyKey,
Input::GRP_EMOTION,
&Actions::emote,
InputAction::EMOTE, 100,
@@ -1106,8 +1093,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyEmoteShortcut46",
- InputType::KEYBOARD, SDLK_m,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_m),
+ emptyKey,
Input::GRP_EMOTION,
&Actions::emote,
InputAction::EMOTE, 100,
@@ -1115,8 +1102,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyEmoteShortcut47",
- InputType::KEYBOARD, SDLK_COMMA,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_COMMA),
+ emptyKey,
Input::GRP_EMOTION,
&Actions::emote,
InputAction::EMOTE, 100,
@@ -1124,8 +1111,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyEmoteShortcut48",
- InputType::KEYBOARD, SDLK_PERIOD,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_PERIOD),
+ emptyKey,
Input::GRP_EMOTION,
&Actions::emote,
InputAction::EMOTE, 100,
@@ -1133,8 +1120,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyWearOutfit",
- InputType::KEYBOARD, SDLK_RCTRL,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_RCTRL),
+ emptyKey,
Input::GRP_DEFAULT,
nullptr,
InputAction::NO_VALUE, 50,
@@ -1142,8 +1129,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyCopyOutfit",
- InputType::KEYBOARD, SDLK_RALT,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_RALT),
+ emptyKey,
Input::GRP_DEFAULT,
nullptr,
InputAction::NO_VALUE, 50,
@@ -1151,8 +1138,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyCopyEquipedOutfit",
- InputType::KEYBOARD, SDLK_RIGHTBRACKET,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_RIGHTBRACKET),
+ emptyKey,
Input::GRP_DEFAULT,
&Actions::copyEquippedToOutfit,
InputAction::NO_VALUE, 50,
@@ -1160,8 +1147,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyOutfitShortcut1",
- InputType::KEYBOARD, SDLK_1,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_1),
+ emptyKey,
Input::GRP_OUTFIT,
&Actions::outfit,
InputAction::NO_VALUE, 100,
@@ -1169,8 +1156,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyOutfitShortcut2",
- InputType::KEYBOARD, SDLK_2,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_2),
+ emptyKey,
Input::GRP_OUTFIT,
&Actions::outfit,
InputAction::NO_VALUE, 100,
@@ -1178,8 +1165,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyOutfitShortcut3",
- InputType::KEYBOARD, SDLK_3,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_3),
+ emptyKey,
Input::GRP_OUTFIT,
&Actions::outfit,
InputAction::NO_VALUE, 100,
@@ -1187,8 +1174,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyOutfitShortcut4",
- InputType::KEYBOARD, SDLK_4,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_4),
+ emptyKey,
Input::GRP_OUTFIT,
&Actions::outfit,
InputAction::NO_VALUE, 100,
@@ -1196,8 +1183,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyOutfitShortcut5",
- InputType::KEYBOARD, SDLK_5,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_5),
+ emptyKey,
Input::GRP_OUTFIT,
&Actions::outfit,
InputAction::NO_VALUE, 100,
@@ -1205,8 +1192,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyOutfitShortcut6",
- InputType::KEYBOARD, SDLK_6,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_6),
+ emptyKey,
Input::GRP_OUTFIT,
&Actions::outfit,
InputAction::NO_VALUE, 100,
@@ -1214,8 +1201,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyOutfitShortcut7",
- InputType::KEYBOARD, SDLK_7,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_7),
+ emptyKey,
Input::GRP_OUTFIT,
&Actions::outfit,
InputAction::NO_VALUE, 100,
@@ -1223,8 +1210,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyOutfitShortcut8",
- InputType::KEYBOARD, SDLK_8,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_8),
+ emptyKey,
Input::GRP_OUTFIT,
&Actions::outfit,
InputAction::NO_VALUE, 100,
@@ -1232,8 +1219,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyOutfitShortcut9",
- InputType::KEYBOARD, SDLK_9,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_9),
+ emptyKey,
Input::GRP_OUTFIT,
&Actions::outfit,
InputAction::NO_VALUE, 100,
@@ -1241,8 +1228,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyOutfitShortcut10",
- InputType::KEYBOARD, SDLK_0,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_0),
+ emptyKey,
Input::GRP_OUTFIT,
&Actions::outfit,
InputAction::NO_VALUE, 100,
@@ -1250,8 +1237,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyOutfitShortcut11",
- InputType::KEYBOARD, SDLK_MINUS,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_MINUS),
+ emptyKey,
Input::GRP_OUTFIT,
&Actions::outfit,
InputAction::NO_VALUE, 100,
@@ -1259,8 +1246,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyOutfitShortcut12",
- InputType::KEYBOARD, SDLK_EQUALS,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_EQUALS),
+ emptyKey,
Input::GRP_OUTFIT,
&Actions::outfit,
InputAction::NO_VALUE, 100,
@@ -1268,8 +1255,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyOutfitShortcut13",
- InputType::KEYBOARD, SDLK_BACKSPACE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_BACKSPACE),
+ emptyKey,
Input::GRP_OUTFIT,
&Actions::outfit,
InputAction::NO_VALUE, 100,
@@ -1277,8 +1264,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyOutfitShortcut14",
- InputType::KEYBOARD, SDLK_INSERT,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_INSERT),
+ emptyKey,
Input::GRP_OUTFIT,
&Actions::outfit,
InputAction::NO_VALUE, 100,
@@ -1286,8 +1273,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyOutfitShortcut15",
- InputType::KEYBOARD, SDLK_HOME,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_HOME),
+ emptyKey,
Input::GRP_OUTFIT,
&Actions::outfit,
InputAction::NO_VALUE, 100,
@@ -1295,8 +1282,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyOutfitShortcut16",
- InputType::KEYBOARD, SDLK_q,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_q),
+ emptyKey,
Input::GRP_OUTFIT,
&Actions::outfit,
InputAction::NO_VALUE, 100,
@@ -1304,8 +1291,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyOutfitShortcut17",
- InputType::KEYBOARD, SDLK_w,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_w),
+ emptyKey,
Input::GRP_OUTFIT,
&Actions::outfit,
InputAction::NO_VALUE, 100,
@@ -1313,8 +1300,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyOutfitShortcut18",
- InputType::KEYBOARD, SDLK_e,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_e),
+ emptyKey,
Input::GRP_OUTFIT,
&Actions::outfit,
InputAction::NO_VALUE, 100,
@@ -1322,8 +1309,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyOutfitShortcut19",
- InputType::KEYBOARD, SDLK_r,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_r),
+ emptyKey,
Input::GRP_OUTFIT,
&Actions::outfit,
InputAction::NO_VALUE, 100,
@@ -1331,8 +1318,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyOutfitShortcut20",
- InputType::KEYBOARD, SDLK_t,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_t),
+ emptyKey,
Input::GRP_OUTFIT,
&Actions::outfit,
InputAction::NO_VALUE, 100,
@@ -1340,8 +1327,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyOutfitShortcut21",
- InputType::KEYBOARD, SDLK_y,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_y),
+ emptyKey,
Input::GRP_OUTFIT,
&Actions::outfit,
InputAction::NO_VALUE, 100,
@@ -1349,8 +1336,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyOutfitShortcut22",
- InputType::KEYBOARD, SDLK_u,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_u),
+ emptyKey,
Input::GRP_OUTFIT,
&Actions::outfit,
InputAction::NO_VALUE, 100,
@@ -1358,8 +1345,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyOutfitShortcut23",
- InputType::KEYBOARD, SDLK_i,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_i),
+ emptyKey,
Input::GRP_OUTFIT,
&Actions::outfit,
InputAction::NO_VALUE, 100,
@@ -1367,8 +1354,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyOutfitShortcut24",
- InputType::KEYBOARD, SDLK_o,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_o),
+ emptyKey,
Input::GRP_OUTFIT,
&Actions::outfit,
InputAction::NO_VALUE, 100,
@@ -1376,8 +1363,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyOutfitShortcut25",
- InputType::KEYBOARD, SDLK_p,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_p),
+ emptyKey,
Input::GRP_OUTFIT,
&Actions::outfit,
InputAction::NO_VALUE, 100,
@@ -1385,8 +1372,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyOutfitShortcut26",
- InputType::KEYBOARD, SDLK_LEFTBRACKET,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_LEFTBRACKET),
+ emptyKey,
Input::GRP_OUTFIT,
&Actions::outfit,
InputAction::NO_VALUE, 100,
@@ -1394,8 +1381,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyOutfitShortcut27",
- InputType::KEYBOARD, SDLK_RIGHTBRACKET,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_RIGHTBRACKET),
+ emptyKey,
Input::GRP_OUTFIT,
&Actions::outfit,
InputAction::NO_VALUE, 100,
@@ -1403,8 +1390,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyOutfitShortcut28",
- InputType::KEYBOARD, SDLK_BACKSLASH,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_BACKSLASH),
+ emptyKey,
Input::GRP_OUTFIT,
&Actions::outfit,
InputAction::NO_VALUE, 100,
@@ -1412,8 +1399,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyOutfitShortcut29",
- InputType::KEYBOARD, SDLK_a,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_a),
+ emptyKey,
Input::GRP_OUTFIT,
&Actions::outfit,
InputAction::NO_VALUE, 100,
@@ -1421,8 +1408,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyOutfitShortcut30",
- InputType::KEYBOARD, SDLK_s,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_s),
+ emptyKey,
Input::GRP_OUTFIT,
&Actions::outfit,
InputAction::NO_VALUE, 100,
@@ -1430,8 +1417,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyOutfitShortcut31",
- InputType::KEYBOARD, SDLK_d,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_d),
+ emptyKey,
Input::GRP_OUTFIT,
&Actions::outfit,
InputAction::NO_VALUE, 100,
@@ -1439,8 +1426,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyOutfitShortcut32",
- InputType::KEYBOARD, SDLK_f,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_f),
+ emptyKey,
Input::GRP_OUTFIT,
&Actions::outfit,
InputAction::NO_VALUE, 100,
@@ -1448,8 +1435,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyOutfitShortcut33",
- InputType::KEYBOARD, SDLK_g,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_g),
+ emptyKey,
Input::GRP_OUTFIT,
&Actions::outfit,
InputAction::NO_VALUE, 100,
@@ -1457,8 +1444,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyOutfitShortcut34",
- InputType::KEYBOARD, SDLK_h,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_h),
+ emptyKey,
Input::GRP_OUTFIT,
&Actions::outfit,
InputAction::NO_VALUE, 100,
@@ -1466,8 +1453,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyOutfitShortcut35",
- InputType::KEYBOARD, SDLK_j,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_j),
+ emptyKey,
Input::GRP_OUTFIT,
&Actions::outfit,
InputAction::NO_VALUE, 100,
@@ -1475,8 +1462,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyOutfitShortcut36",
- InputType::KEYBOARD, SDLK_k,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_k),
+ emptyKey,
Input::GRP_OUTFIT,
&Actions::outfit,
InputAction::NO_VALUE, 100,
@@ -1484,8 +1471,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyOutfitShortcut37",
- InputType::KEYBOARD, SDLK_l,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_l),
+ emptyKey,
Input::GRP_OUTFIT,
&Actions::outfit,
InputAction::NO_VALUE, 100,
@@ -1493,8 +1480,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyOutfitShortcut38",
- InputType::KEYBOARD, SDLK_SEMICOLON,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_SEMICOLON),
+ emptyKey,
Input::GRP_OUTFIT,
&Actions::outfit,
InputAction::NO_VALUE, 100,
@@ -1502,8 +1489,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyOutfitShortcut39",
- InputType::KEYBOARD, SDLK_QUOTE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_QUOTE),
+ emptyKey,
Input::GRP_OUTFIT,
&Actions::outfit,
InputAction::NO_VALUE, 100,
@@ -1511,8 +1498,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyOutfitShortcut40",
- InputType::KEYBOARD, SDLK_z,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_z),
+ emptyKey,
Input::GRP_OUTFIT,
&Actions::outfit,
InputAction::NO_VALUE, 100,
@@ -1520,8 +1507,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyOutfitShortcut41",
- InputType::KEYBOARD, SDLK_x,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_x),
+ emptyKey,
Input::GRP_OUTFIT,
&Actions::outfit,
InputAction::NO_VALUE, 100,
@@ -1529,8 +1516,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyOutfitShortcut42",
- InputType::KEYBOARD, SDLK_c,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_c),
+ emptyKey,
Input::GRP_OUTFIT,
&Actions::outfit,
InputAction::NO_VALUE, 100,
@@ -1538,8 +1525,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyOutfitShortcut43",
- InputType::KEYBOARD, SDLK_v,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_v),
+ emptyKey,
Input::GRP_OUTFIT,
&Actions::outfit,
InputAction::NO_VALUE, 100,
@@ -1547,8 +1534,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyOutfitShortcut44",
- InputType::KEYBOARD, SDLK_b,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_b),
+ emptyKey,
Input::GRP_OUTFIT,
&Actions::outfit,
InputAction::NO_VALUE, 100,
@@ -1556,8 +1543,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyOutfitShortcut45",
- InputType::KEYBOARD, SDLK_n,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_n),
+ emptyKey,
Input::GRP_OUTFIT,
&Actions::outfit,
InputAction::NO_VALUE, 100,
@@ -1565,8 +1552,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyOutfitShortcut46",
- InputType::KEYBOARD, SDLK_m,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_m),
+ emptyKey,
Input::GRP_OUTFIT,
&Actions::outfit,
InputAction::NO_VALUE, 100,
@@ -1574,8 +1561,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyOutfitShortcut47",
- InputType::KEYBOARD, SDLK_COMMA,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_COMMA),
+ emptyKey,
Input::GRP_OUTFIT,
&Actions::outfit,
InputAction::NO_VALUE, 100,
@@ -1583,8 +1570,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyOutfitShortcut48",
- InputType::KEYBOARD, SDLK_PERIOD,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_PERIOD),
+ emptyKey,
Input::GRP_OUTFIT,
&Actions::outfit,
InputAction::NO_VALUE, 100,
@@ -1592,8 +1579,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyMoveToPointShortcut1",
- InputType::KEYBOARD, SDLK_1,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_1),
+ emptyKey,
Input::GRP_MOVETOPOINT,
&Actions::moveToPoint,
InputAction::MOVE_TO_POINT, 100,
@@ -1601,8 +1588,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyMoveToPointShortcut2",
- InputType::KEYBOARD, SDLK_2,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_2),
+ emptyKey,
Input::GRP_MOVETOPOINT,
&Actions::moveToPoint,
InputAction::MOVE_TO_POINT, 100,
@@ -1610,8 +1597,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyMoveToPointShortcut3",
- InputType::KEYBOARD, SDLK_3,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_3),
+ emptyKey,
Input::GRP_MOVETOPOINT,
&Actions::moveToPoint,
InputAction::MOVE_TO_POINT, 100,
@@ -1619,8 +1606,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyMoveToPointShortcut4",
- InputType::KEYBOARD, SDLK_4,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_4),
+ emptyKey,
Input::GRP_MOVETOPOINT,
&Actions::moveToPoint,
InputAction::MOVE_TO_POINT, 100,
@@ -1628,8 +1615,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyMoveToPointShortcut5",
- InputType::KEYBOARD, SDLK_5,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_5),
+ emptyKey,
Input::GRP_MOVETOPOINT,
&Actions::moveToPoint,
InputAction::MOVE_TO_POINT, 100,
@@ -1637,8 +1624,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyMoveToPointShortcut6",
- InputType::KEYBOARD, SDLK_6,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_6),
+ emptyKey,
Input::GRP_MOVETOPOINT,
&Actions::moveToPoint,
InputAction::MOVE_TO_POINT, 100,
@@ -1646,8 +1633,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyMoveToPointShortcut7",
- InputType::KEYBOARD, SDLK_7,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_7),
+ emptyKey,
Input::GRP_MOVETOPOINT,
&Actions::moveToPoint,
InputAction::MOVE_TO_POINT, 100,
@@ -1655,8 +1642,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyMoveToPointShortcut8",
- InputType::KEYBOARD, SDLK_8,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_8),
+ emptyKey,
Input::GRP_MOVETOPOINT,
&Actions::moveToPoint,
InputAction::MOVE_TO_POINT, 100,
@@ -1664,8 +1651,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyMoveToPointShortcut9",
- InputType::KEYBOARD, SDLK_9,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_9),
+ emptyKey,
Input::GRP_MOVETOPOINT,
&Actions::moveToPoint,
InputAction::MOVE_TO_POINT, 100,
@@ -1673,8 +1660,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyMoveToPointShortcut10",
- InputType::KEYBOARD, SDLK_0,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_0),
+ emptyKey,
Input::GRP_MOVETOPOINT,
&Actions::moveToPoint,
InputAction::MOVE_TO_POINT, 100,
@@ -1682,8 +1669,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyMoveToPointShortcut11",
- InputType::KEYBOARD, SDLK_MINUS,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_MINUS),
+ emptyKey,
Input::GRP_MOVETOPOINT,
&Actions::moveToPoint,
InputAction::MOVE_TO_POINT, 100,
@@ -1691,8 +1678,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyMoveToPointShortcut12",
- InputType::KEYBOARD, SDLK_EQUALS,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_EQUALS),
+ emptyKey,
Input::GRP_MOVETOPOINT,
&Actions::moveToPoint,
InputAction::MOVE_TO_POINT, 100,
@@ -1700,8 +1687,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyMoveToPointShortcut13",
- InputType::KEYBOARD, SDLK_BACKSPACE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_BACKSPACE),
+ emptyKey,
Input::GRP_MOVETOPOINT,
&Actions::moveToPoint,
InputAction::MOVE_TO_POINT, 100,
@@ -1709,8 +1696,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyMoveToPointShortcut14",
- InputType::KEYBOARD, SDLK_INSERT,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_INSERT),
+ emptyKey,
Input::GRP_MOVETOPOINT,
&Actions::moveToPoint,
InputAction::MOVE_TO_POINT, 100,
@@ -1718,8 +1705,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyMoveToPointShortcut15",
- InputType::KEYBOARD, SDLK_HOME,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_HOME),
+ emptyKey,
Input::GRP_MOVETOPOINT,
&Actions::moveToPoint,
InputAction::MOVE_TO_POINT, 100,
@@ -1727,8 +1714,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyMoveToPointShortcut16",
- InputType::KEYBOARD, SDLK_q,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_q),
+ emptyKey,
Input::GRP_MOVETOPOINT,
&Actions::moveToPoint,
InputAction::MOVE_TO_POINT, 100,
@@ -1736,8 +1723,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyMoveToPointShortcut17",
- InputType::KEYBOARD, SDLK_w,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_w),
+ emptyKey,
Input::GRP_MOVETOPOINT,
&Actions::moveToPoint,
InputAction::MOVE_TO_POINT, 100,
@@ -1745,8 +1732,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyMoveToPointShortcut18",
- InputType::KEYBOARD, SDLK_e,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_e),
+ emptyKey,
Input::GRP_MOVETOPOINT,
&Actions::moveToPoint,
InputAction::MOVE_TO_POINT, 100,
@@ -1754,8 +1741,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyMoveToPointShortcut19",
- InputType::KEYBOARD, SDLK_r,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_r),
+ emptyKey,
Input::GRP_MOVETOPOINT,
&Actions::moveToPoint,
InputAction::MOVE_TO_POINT, 100,
@@ -1763,8 +1750,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyMoveToPointShortcut20",
- InputType::KEYBOARD, SDLK_t,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_t),
+ emptyKey,
Input::GRP_MOVETOPOINT,
&Actions::moveToPoint,
InputAction::MOVE_TO_POINT, 100,
@@ -1772,8 +1759,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyMoveToPointShortcut21",
- InputType::KEYBOARD, SDLK_y,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_y),
+ emptyKey,
Input::GRP_MOVETOPOINT,
&Actions::moveToPoint,
InputAction::MOVE_TO_POINT, 100,
@@ -1781,8 +1768,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyMoveToPointShortcut22",
- InputType::KEYBOARD, SDLK_u,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_u),
+ emptyKey,
Input::GRP_MOVETOPOINT,
&Actions::moveToPoint,
InputAction::MOVE_TO_POINT, 100,
@@ -1790,8 +1777,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyMoveToPointShortcut23",
- InputType::KEYBOARD, SDLK_i,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_i),
+ emptyKey,
Input::GRP_MOVETOPOINT,
&Actions::moveToPoint,
InputAction::MOVE_TO_POINT, 100,
@@ -1799,8 +1786,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyMoveToPointShortcut24",
- InputType::KEYBOARD, SDLK_o,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_o),
+ emptyKey,
Input::GRP_MOVETOPOINT,
&Actions::moveToPoint,
InputAction::MOVE_TO_POINT, 100,
@@ -1808,8 +1795,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyMoveToPointShortcut25",
- InputType::KEYBOARD, SDLK_p,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_p),
+ emptyKey,
Input::GRP_MOVETOPOINT,
&Actions::moveToPoint,
InputAction::MOVE_TO_POINT, 100,
@@ -1817,8 +1804,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyMoveToPointShortcut26",
- InputType::KEYBOARD, SDLK_LEFTBRACKET,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_LEFTBRACKET),
+ emptyKey,
Input::GRP_MOVETOPOINT,
&Actions::moveToPoint,
InputAction::MOVE_TO_POINT, 100,
@@ -1826,8 +1813,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyMoveToPointShortcut27",
- InputType::KEYBOARD, SDLK_RIGHTBRACKET,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_RIGHTBRACKET),
+ emptyKey,
Input::GRP_MOVETOPOINT,
&Actions::moveToPoint,
InputAction::MOVE_TO_POINT, 100,
@@ -1835,8 +1822,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyMoveToPointShortcut28",
- InputType::KEYBOARD, SDLK_BACKSLASH,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_BACKSLASH),
+ emptyKey,
Input::GRP_MOVETOPOINT,
&Actions::moveToPoint,
InputAction::MOVE_TO_POINT, 100,
@@ -1844,8 +1831,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyMoveToPointShortcut29",
- InputType::KEYBOARD, SDLK_a,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_a),
+ emptyKey,
Input::GRP_MOVETOPOINT,
&Actions::moveToPoint,
InputAction::MOVE_TO_POINT, 100,
@@ -1853,8 +1840,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyMoveToPointShortcut30",
- InputType::KEYBOARD, SDLK_s,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_s),
+ emptyKey,
Input::GRP_MOVETOPOINT,
&Actions::moveToPoint,
InputAction::MOVE_TO_POINT, 100,
@@ -1862,8 +1849,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyMoveToPointShortcut31",
- InputType::KEYBOARD, SDLK_d,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_d),
+ emptyKey,
Input::GRP_MOVETOPOINT,
&Actions::moveToPoint,
InputAction::MOVE_TO_POINT, 100,
@@ -1871,8 +1858,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyMoveToPointShortcut32",
- InputType::KEYBOARD, SDLK_f,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_f),
+ emptyKey,
Input::GRP_MOVETOPOINT,
&Actions::moveToPoint,
InputAction::MOVE_TO_POINT, 100,
@@ -1880,8 +1867,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyMoveToPointShortcut33",
- InputType::KEYBOARD, SDLK_g,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_g),
+ emptyKey,
Input::GRP_MOVETOPOINT,
&Actions::moveToPoint,
InputAction::MOVE_TO_POINT, 100,
@@ -1889,8 +1876,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyMoveToPointShortcut34",
- InputType::KEYBOARD, SDLK_h,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_h),
+ emptyKey,
Input::GRP_MOVETOPOINT,
&Actions::moveToPoint,
InputAction::MOVE_TO_POINT, 100,
@@ -1898,8 +1885,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyMoveToPointShortcut35",
- InputType::KEYBOARD, SDLK_j,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_j),
+ emptyKey,
Input::GRP_MOVETOPOINT,
&Actions::moveToPoint,
InputAction::MOVE_TO_POINT, 100,
@@ -1907,8 +1894,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyMoveToPointShortcut36",
- InputType::KEYBOARD, SDLK_k,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_k),
+ emptyKey,
Input::GRP_MOVETOPOINT,
&Actions::moveToPoint,
InputAction::MOVE_TO_POINT, 100,
@@ -1916,8 +1903,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyMoveToPointShortcut37",
- InputType::KEYBOARD, SDLK_l,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_l),
+ emptyKey,
Input::GRP_MOVETOPOINT,
&Actions::moveToPoint,
InputAction::MOVE_TO_POINT, 100,
@@ -1925,8 +1912,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyMoveToPointShortcut38",
- InputType::KEYBOARD, SDLK_SEMICOLON,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_SEMICOLON),
+ emptyKey,
Input::GRP_MOVETOPOINT,
&Actions::moveToPoint,
InputAction::MOVE_TO_POINT, 100,
@@ -1934,8 +1921,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyMoveToPointShortcut39",
- InputType::KEYBOARD, SDLK_QUOTE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_QUOTE),
+ emptyKey,
Input::GRP_MOVETOPOINT,
&Actions::moveToPoint,
InputAction::MOVE_TO_POINT, 100,
@@ -1943,8 +1930,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyMoveToPointShortcut40",
- InputType::KEYBOARD, SDLK_z,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_z),
+ emptyKey,
Input::GRP_MOVETOPOINT,
&Actions::moveToPoint,
InputAction::MOVE_TO_POINT, 100,
@@ -1952,8 +1939,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyMoveToPointShortcut41",
- InputType::KEYBOARD, SDLK_x,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_x),
+ emptyKey,
Input::GRP_MOVETOPOINT,
&Actions::moveToPoint,
InputAction::MOVE_TO_POINT, 100,
@@ -1961,8 +1948,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyMoveToPointShortcut42",
- InputType::KEYBOARD, SDLK_c,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_c),
+ emptyKey,
Input::GRP_MOVETOPOINT,
&Actions::moveToPoint,
InputAction::MOVE_TO_POINT, 100,
@@ -1970,8 +1957,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyMoveToPointShortcut43",
- InputType::KEYBOARD, SDLK_v,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_v),
+ emptyKey,
Input::GRP_MOVETOPOINT,
&Actions::moveToPoint,
InputAction::MOVE_TO_POINT, 100,
@@ -1979,8 +1966,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyMoveToPointShortcut44",
- InputType::KEYBOARD, SDLK_b,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_b),
+ emptyKey,
Input::GRP_MOVETOPOINT,
&Actions::moveToPoint,
InputAction::MOVE_TO_POINT, 100,
@@ -1988,8 +1975,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyMoveToPointShortcut45",
- InputType::KEYBOARD, SDLK_n,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_n),
+ emptyKey,
Input::GRP_MOVETOPOINT,
&Actions::moveToPoint,
InputAction::MOVE_TO_POINT, 100,
@@ -1997,8 +1984,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyMoveToPointShortcut46",
- InputType::KEYBOARD, SDLK_m,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_m),
+ emptyKey,
Input::GRP_MOVETOPOINT,
&Actions::moveToPoint,
InputAction::MOVE_TO_POINT, 100,
@@ -2006,8 +1993,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyMoveToPointShortcut47",
- InputType::KEYBOARD, SDLK_COMMA,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_COMMA),
+ emptyKey,
Input::GRP_MOVETOPOINT,
&Actions::moveToPoint,
InputAction::MOVE_TO_POINT, 100,
@@ -2015,8 +2002,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyMoveToPointShortcut48",
- InputType::KEYBOARD, SDLK_PERIOD,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_PERIOD),
+ emptyKey,
Input::GRP_MOVETOPOINT,
&Actions::moveToPoint,
InputAction::MOVE_TO_POINT, 100,
@@ -2024,8 +2011,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyChat",
- InputType::KEYBOARD, SDLK_RETURN,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_RETURN),
+ emptyKey,
Input::GRP_DEFAULT | Input::GRP_CHAT,
&Actions::toggleChat,
InputAction::NO_VALUE, 50,
@@ -2034,8 +2021,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"chat",
false},
{"keyChatScrollUp",
- InputType::KEYBOARD, SDLK_PAGEUP,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_PAGEUP),
+ emptyKey,
Input::GRP_DEFAULT | Input::GRP_GUI,
&Actions::scrollChatUp,
InputAction::NO_VALUE, 50,
@@ -2043,8 +2030,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"chatscrollup",
false},
{"keyChatScrollDown",
- InputType::KEYBOARD, SDLK_PAGEDOWN,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_PAGEDOWN),
+ emptyKey,
Input::GRP_DEFAULT | Input::GRP_GUI,
&Actions::scrollChatDown,
InputAction::NO_VALUE, 50,
@@ -2052,8 +2039,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"chatscrolldown",
false},
{"keyChatPrevTab",
- InputType::KEYBOARD, SDLK_KP7,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_KP7),
+ emptyKey,
Input::GRP_DEFAULT | Input::GRP_GUI,
&Actions::prevChatTab,
InputAction::NO_VALUE, 50,
@@ -2061,8 +2048,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"prevtab",
false},
{"keyChatNextTab",
- InputType::KEYBOARD, SDLK_KP9,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_KP9),
+ emptyKey,
Input::GRP_DEFAULT | Input::GRP_GUI,
&Actions::nextChatTab,
InputAction::NO_VALUE, 50,
@@ -2070,8 +2057,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"nexttab",
false},
{"keyChatCloseTab",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ emptyKey,
+ emptyKey,
Input::GRP_DEFAULT | Input::GRP_GUI,
&Actions::closeChatTab,
InputAction::NO_VALUE, 50,
@@ -2079,8 +2066,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"close",
false},
{"keyChatPrevHistory",
- InputType::KEYBOARD, SDLK_KP7,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_KP7),
+ emptyKey,
Input::GRP_CHAT | Input::GRP_GUICHAN,
nullptr,
InputAction::NO_VALUE, 50,
@@ -2088,8 +2075,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyChatNextHistory",
- InputType::KEYBOARD, SDLK_KP9,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_KP9),
+ emptyKey,
Input::GRP_CHAT | Input::GRP_GUICHAN,
nullptr,
InputAction::NO_VALUE, 50,
@@ -2098,11 +2085,11 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
false},
{"keyIgnoreInput1",
#ifdef USE_SDL2
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ emptyKey,
#else
- InputType::KEYBOARD, SDLK_LSUPER,
+ addKey(SDLK_LSUPER),
#endif
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ emptyKey,
Input::GRP_DEFAULT,
&Actions::ignoreInput,
InputAction::NO_VALUE, 500,
@@ -2111,11 +2098,11 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
false},
{"keyIgnoreInput2",
#ifdef USE_SDL2
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ emptyKey,
#else
- InputType::KEYBOARD, SDLK_RSUPER,
+ addKey(SDLK_RSUPER),
#endif
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ emptyKey,
Input::GRP_DEFAULT,
&Actions::ignoreInput,
InputAction::NO_VALUE, 500,
@@ -2123,44 +2110,28 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyDirectUp",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::directUp,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::directUp),
InputCondition::GAME,
"directup|turnup",
false},
{"keyDirectDown",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::directDown,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::directDown),
InputCondition::GAME,
"directdown|turndown",
false},
{"keyDirectLeft",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::directLeft,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::directLeft),
InputCondition::GAME,
"directleft|turnleft",
false},
{"keyDirectRight",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::directRight,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::directRight),
InputCondition::GAME,
"directright|turnright",
false},
{"keyCrazyMoves",
- InputType::KEYBOARD, SDLK_SLASH,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_SLASH),
+ emptyKey,
Input::GRP_DEFAULT,
&Actions::crazyMoves,
InputAction::NO_VALUE, 50,
@@ -2168,8 +2139,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyChangeCrazyMoveType",
- InputType::KEYBOARD, SDLK_BACKSLASH,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_BACKSLASH),
+ emptyKey,
Input::GRP_DEFAULT,
&Actions::changeCrazyMove,
InputAction::NO_VALUE, 50,
@@ -2178,8 +2149,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyQuickDrop",
- InputType::KEYBOARD, SDLK_y,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_y),
+ emptyKey,
Input::GRP_DEFAULT,
&Actions::dropItem0,
InputAction::NO_VALUE, 50,
@@ -2187,8 +2158,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"drop",
false},
{"keyQuickDropN",
- InputType::KEYBOARD, SDLK_u,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_u),
+ emptyKey,
Input::GRP_DEFAULT,
&Actions::dropItem,
InputAction::NO_VALUE, 50,
@@ -2196,8 +2167,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"dropn",
false},
{"keySwitchQuickDrop",
- InputType::KEYBOARD, SDLK_i,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_i),
+ emptyKey,
Input::GRP_DEFAULT,
&Actions::switchQuickDrop,
InputAction::NO_VALUE, 50,
@@ -2205,8 +2176,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyMagicInma1",
- InputType::KEYBOARD, SDLK_c,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_c),
+ emptyKey,
Input::GRP_DEFAULT,
&Actions::heal,
InputAction::NO_VALUE, 50,
@@ -2214,8 +2185,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"heal",
true},
{"keyMagicItenplz",
- InputType::KEYBOARD, SDLK_m,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_m),
+ emptyKey,
Input::GRP_DEFAULT,
&Actions::itenplz,
InputAction::NO_VALUE, 50,
@@ -2223,8 +2194,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"itenplz",
false},
{"keyMagicAttack",
- InputType::KEYBOARD, SDLK_b,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_b),
+ emptyKey,
Input::GRP_DEFAULT,
&Actions::magicAttack,
InputAction::NO_VALUE, 50,
@@ -2232,8 +2203,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"magicattack",
false},
{"keySwitchMagicAttack",
- InputType::KEYBOARD, SDLK_COMMA,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_COMMA),
+ emptyKey,
Input::GRP_DEFAULT,
&Actions::changeMagicAttackType,
InputAction::NO_VALUE, 50,
@@ -2242,28 +2213,20 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keySwitchPvpAttack",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::changePvpMode,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::changePvpMode),
InputCondition::GAME | InputCondition::VALIDSPEED
| InputCondition::EMODS,
"",
false},
{"keyInvertDirection",
- InputType::KEYBOARD, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::changeMoveType,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::changeMoveType),
InputCondition::GAME | InputCondition::VALIDSPEED
| InputCondition::EMODS,
"",
false},
{"keyChangeAttackWeaponType",
- InputType::KEYBOARD, SDLK_g,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_g),
+ emptyKey,
Input::GRP_DEFAULT,
&Actions::changeAttackWeaponType,
InputAction::NO_VALUE, 50,
@@ -2272,8 +2235,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyChangeAttackType",
- InputType::KEYBOARD, SDLK_END,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_END),
+ emptyKey,
Input::GRP_DEFAULT,
&Actions::changeAttackType,
InputAction::NO_VALUE, 50,
@@ -2282,8 +2245,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyChangeFollowMode",
- InputType::KEYBOARD, SDLK_KP1,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_KP1),
+ emptyKey,
Input::GRP_DEFAULT,
&Actions::changeFollowMode,
InputAction::NO_VALUE, 50,
@@ -2292,8 +2255,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyChangeImitationMode",
- InputType::KEYBOARD, SDLK_KP4,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_KP4),
+ emptyKey,
Input::GRP_DEFAULT,
&Actions::changeImitationMode,
InputAction::NO_VALUE, 50,
@@ -2302,8 +2265,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyDisableGameModifiers",
- InputType::KEYBOARD, SDLK_KP8,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_KP8),
+ emptyKey,
Input::GRP_DEFAULT,
&Actions::changeGameModifier,
InputAction::NO_VALUE, 50,
@@ -2311,8 +2274,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyChangeAudio",
- InputType::KEYBOARD, SDLK_KP3,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_KP3),
+ emptyKey,
Input::GRP_DEFAULT,
&Actions::changeAudio,
InputAction::NO_VALUE, 50,
@@ -2320,8 +2283,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"audio",
false},
{"keyAway",
- InputType::KEYBOARD, SDLK_KP2,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_KP2),
+ emptyKey,
Input::GRP_DEFAULT,
&Actions::away,
InputAction::NO_VALUE, 50,
@@ -2329,8 +2292,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyRightClick",
- InputType::KEYBOARD, SDLK_TAB,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_TAB),
+ emptyKey,
Input::GRP_DEFAULT,
&Actions::mouseClick,
InputAction::NO_VALUE, 50,
@@ -2339,8 +2302,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"rightclick",
false},
{"keyCameraMode",
- InputType::KEYBOARD, SDLK_KP_PLUS,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_KP_PLUS),
+ emptyKey,
Input::GRP_DEFAULT,
&Actions::camera,
InputAction::NO_VALUE, 50,
@@ -2349,8 +2312,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyMod",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ emptyKey,
+ emptyKey,
0,
nullptr,
InputAction::NO_VALUE, 50,
@@ -2358,8 +2321,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyGUIUp",
- InputType::KEYBOARD, SDLK_UP,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_UP),
+ emptyKey,
Input::GRP_GUICHAN,
nullptr,
InputAction::NO_VALUE, 50,
@@ -2367,8 +2330,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyGUIDown",
- InputType::KEYBOARD, SDLK_DOWN,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_DOWN),
+ emptyKey,
Input::GRP_GUICHAN,
nullptr,
InputAction::NO_VALUE, 50,
@@ -2376,8 +2339,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyGUILeft",
- InputType::KEYBOARD, SDLK_LEFT,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_LEFT),
+ emptyKey,
Input::GRP_GUICHAN,
nullptr,
InputAction::NO_VALUE, 50,
@@ -2385,8 +2348,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyGUIRight",
- InputType::KEYBOARD, SDLK_RIGHT,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_RIGHT),
+ emptyKey,
Input::GRP_GUICHAN,
nullptr,
InputAction::NO_VALUE, 50,
@@ -2394,8 +2357,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyGUISelect",
- InputType::KEYBOARD, SDLK_SPACE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_SPACE),
+ emptyKey,
Input::GRP_GUICHAN,
nullptr,
InputAction::NO_VALUE, 50,
@@ -2403,8 +2366,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyGUISelect2",
- InputType::KEYBOARD, SDLK_RETURN,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_RETURN),
+ emptyKey,
Input::GRP_GUICHAN,
nullptr,
InputAction::NO_VALUE, 50,
@@ -2412,11 +2375,11 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyGUICancel",
- InputType::KEYBOARD, SDLK_ESCAPE,
+ addKey(SDLK_ESCAPE),
#if defined(USE_SDL2) && defined(ANDROID)
- InputType::KEYBOARD, SDLK_AC_BACK,
+ addKey(SDLK_AC_BACK),
#else
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ emptyKey,
#endif
Input::GRP_GUICHAN,
nullptr,
@@ -2425,8 +2388,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyGUIHome",
- InputType::KEYBOARD, SDLK_HOME,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_HOME),
+ emptyKey,
Input::GRP_GUICHAN,
nullptr,
InputAction::NO_VALUE, 50,
@@ -2434,8 +2397,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyGUIEnd",
- InputType::KEYBOARD, SDLK_END,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_END),
+ emptyKey,
Input::GRP_GUICHAN,
nullptr,
InputAction::NO_VALUE, 50,
@@ -2443,8 +2406,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyGUIDelete",
- InputType::KEYBOARD, SDLK_DELETE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_DELETE),
+ emptyKey,
Input::GRP_GUICHAN,
nullptr,
InputAction::NO_VALUE, 50,
@@ -2452,8 +2415,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyGUIBackSpace",
- InputType::KEYBOARD, SDLK_BACKSPACE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_BACKSPACE),
+ emptyKey,
Input::GRP_GUICHAN,
nullptr,
InputAction::NO_VALUE, 50,
@@ -2461,8 +2424,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyGUITab",
- InputType::KEYBOARD, SDLK_TAB,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_TAB),
+ emptyKey,
Input::GRP_GUICHAN,
nullptr,
InputAction::NO_VALUE, 50,
@@ -2470,8 +2433,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyGUIPageUp",
- InputType::KEYBOARD, SDLK_PAGEUP,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_PAGEUP),
+ emptyKey,
Input::GRP_GUICHAN,
nullptr,
InputAction::NO_VALUE, 50,
@@ -2479,8 +2442,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyGUIPageDown",
- InputType::KEYBOARD, SDLK_PAGEDOWN,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_PAGEDOWN),
+ emptyKey,
Input::GRP_GUICHAN,
nullptr,
InputAction::NO_VALUE, 50,
@@ -2488,8 +2451,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyGUIInsert",
- InputType::KEYBOARD, SDLK_INSERT,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_INSERT),
+ emptyKey,
Input::GRP_GUICHAN,
nullptr,
InputAction::NO_VALUE, 50,
@@ -2497,8 +2460,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyGUIMod",
- InputType::KEYBOARD, SDLK_LSHIFT,
- InputType::KEYBOARD, SDLK_RSHIFT,
+ addKey(SDLK_LSHIFT),
+ addKey(SDLK_RSHIFT),
Input::GRP_GUICHAN,
nullptr,
InputAction::NO_VALUE, 50,
@@ -2506,8 +2469,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keySafeVideo",
- InputType::KEYBOARD, SDLK_KP_MINUS,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_KP_MINUS),
+ emptyKey,
Input::GRP_DEFAULT,
&Actions::safeVideoMode,
InputAction::NO_VALUE, 50,
@@ -2515,35 +2478,23 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyStopSit",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::stopSit,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::stopSit),
InputCondition::DEFAULT | InputCondition::INGAME,
"sit2",
false},
{"keyShowKeyboard",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::showKeyboard,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::showKeyboard),
InputCondition::DEFAULT,
"showkeyboard",
false},
{"keyShowWindows",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::showWindows,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::showWindows),
InputCondition::DEFAULT,
"showwindows",
false},
{"keyChatMod",
- InputType::KEYBOARD, SDLK_LSHIFT,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_LSHIFT),
+ emptyKey,
Input::GRP_CHAT,
nullptr,
InputAction::NO_VALUE, 50,
@@ -2551,17 +2502,13 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyMoveForward",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::moveForward,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::moveForward),
InputCondition::ARROWKEYS,
"",
false},
{"keyGUICtrl",
- InputType::KEYBOARD, SDLK_LCTRL,
- InputType::KEYBOARD, SDLK_RCTRL,
+ addKey(SDLK_LCTRL),
+ addKey(SDLK_RCTRL),
Input::GRP_GUICHAN,
nullptr,
InputAction::NO_VALUE, 50,
@@ -2569,8 +2516,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyGUIb",
- InputType::KEYBOARD, SDLK_b,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_b),
+ emptyKey,
Input::GRP_GUICHAN,
nullptr,
InputAction::NO_VALUE, 50,
@@ -2578,8 +2525,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyGUIc",
- InputType::KEYBOARD, SDLK_c,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_c),
+ emptyKey,
Input::GRP_GUICHAN,
nullptr,
InputAction::NO_VALUE, 50,
@@ -2587,8 +2534,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyGUId",
- InputType::KEYBOARD, SDLK_d,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_d),
+ emptyKey,
Input::GRP_GUICHAN,
nullptr,
InputAction::NO_VALUE, 50,
@@ -2596,8 +2543,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyGUIe",
- InputType::KEYBOARD, SDLK_e,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_e),
+ emptyKey,
Input::GRP_GUICHAN,
nullptr,
InputAction::NO_VALUE, 50,
@@ -2605,8 +2552,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyGUIf",
- InputType::KEYBOARD, SDLK_f,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_f),
+ emptyKey,
Input::GRP_GUICHAN,
nullptr,
InputAction::NO_VALUE, 50,
@@ -2614,8 +2561,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyGUIh",
- InputType::KEYBOARD, SDLK_h,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_h),
+ emptyKey,
Input::GRP_GUICHAN,
nullptr,
InputAction::NO_VALUE, 50,
@@ -2623,8 +2570,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyGUIk",
- InputType::KEYBOARD, SDLK_k,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_k),
+ emptyKey,
Input::GRP_GUICHAN,
nullptr,
InputAction::NO_VALUE, 50,
@@ -2632,8 +2579,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyGUIu",
- InputType::KEYBOARD, SDLK_u,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_u),
+ emptyKey,
Input::GRP_GUICHAN,
nullptr,
InputAction::NO_VALUE, 50,
@@ -2641,8 +2588,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyGUIv",
- InputType::KEYBOARD, SDLK_v,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_v),
+ emptyKey,
Input::GRP_GUICHAN,
nullptr,
InputAction::NO_VALUE, 50,
@@ -2650,8 +2597,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyGUIw",
- InputType::KEYBOARD, SDLK_w,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_w),
+ emptyKey,
Input::GRP_GUICHAN,
nullptr,
InputAction::NO_VALUE, 50,
@@ -2659,8 +2606,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyShortcutsPrevTab",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ emptyKey,
+ emptyKey,
Input::GRP_DEFAULT | Input::GRP_GUI,
&Actions::prevShortcutsTab,
InputAction::NO_VALUE, 50,
@@ -2668,8 +2615,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"shortcutprevtab",
false},
{"keyShortcutsNextTab",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ emptyKey,
+ emptyKey,
Input::GRP_DEFAULT | Input::GRP_GUI,
&Actions::nextShortcutsTab,
InputAction::NO_VALUE, 50,
@@ -2677,8 +2624,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"shortcutnexttab",
false},
{"keyCommandsPrevTab",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ emptyKey,
+ emptyKey,
Input::GRP_DEFAULT | Input::GRP_GUI,
&Actions::prevCommandsTab,
InputAction::NO_VALUE, 50,
@@ -2686,8 +2633,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"commandsprevtab",
false},
{"keyCommandsNextTab",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ emptyKey,
+ emptyKey,
Input::GRP_DEFAULT | Input::GRP_GUI,
&Actions::nextCommandsTab,
InputAction::NO_VALUE, 50,
@@ -2695,18 +2642,13 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"commandsnexttab",
false},
{"keyOpenTrade",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::openTrade,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::openTrade),
InputCondition::GAME | InputCondition::NOTARGET,
"trade",
false},
-
{"keyGUIF1",
- InputType::KEYBOARD, SDLK_F1,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_F1),
+ emptyKey,
Input::GRP_GUICHAN | Input::GRP_CHAT,
nullptr,
InputAction::NO_VALUE, 50,
@@ -2714,8 +2656,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyGUIF2",
- InputType::KEYBOARD, SDLK_F2,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_F2),
+ emptyKey,
Input::GRP_GUICHAN | Input::GRP_CHAT,
nullptr,
InputAction::NO_VALUE, 50,
@@ -2723,8 +2665,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyGUIF3",
- InputType::KEYBOARD, SDLK_F3,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_F3),
+ emptyKey,
Input::GRP_GUICHAN | Input::GRP_CHAT,
nullptr,
InputAction::NO_VALUE, 50,
@@ -2732,8 +2674,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyGUIF4",
- InputType::KEYBOARD, SDLK_F4,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_F4),
+ emptyKey,
Input::GRP_GUICHAN | Input::GRP_CHAT,
nullptr,
InputAction::NO_VALUE, 50,
@@ -2741,8 +2683,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyGUIF5",
- InputType::KEYBOARD, SDLK_F5,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_F5),
+ emptyKey,
Input::GRP_GUICHAN | Input::GRP_CHAT,
nullptr,
InputAction::NO_VALUE, 50,
@@ -2750,8 +2692,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyGUIF6",
- InputType::KEYBOARD, SDLK_F6,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_F6),
+ emptyKey,
Input::GRP_GUICHAN | Input::GRP_CHAT,
nullptr,
InputAction::NO_VALUE, 50,
@@ -2759,8 +2701,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyGUIF7",
- InputType::KEYBOARD, SDLK_F7,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_F7),
+ emptyKey,
Input::GRP_GUICHAN | Input::GRP_CHAT,
nullptr,
InputAction::NO_VALUE, 50,
@@ -2768,8 +2710,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyGUIF8",
- InputType::KEYBOARD, SDLK_F8,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_F8),
+ emptyKey,
Input::GRP_GUICHAN | Input::GRP_CHAT,
nullptr,
InputAction::NO_VALUE, 50,
@@ -2777,8 +2719,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyGUIF9",
- InputType::KEYBOARD, SDLK_F9,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_F9),
+ emptyKey,
Input::GRP_GUICHAN | Input::GRP_CHAT,
nullptr,
InputAction::NO_VALUE, 50,
@@ -2786,8 +2728,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyGUIF10",
- InputType::KEYBOARD, SDLK_F10,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_F10),
+ emptyKey,
Input::GRP_GUICHAN | Input::GRP_CHAT,
nullptr,
InputAction::NO_VALUE, 50,
@@ -2795,8 +2737,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyGUIF11",
- InputType::KEYBOARD, SDLK_F11,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_F11),
+ emptyKey,
Input::GRP_GUICHAN | Input::GRP_CHAT,
nullptr,
InputAction::NO_VALUE, 50,
@@ -2804,8 +2746,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyGUIF12",
- InputType::KEYBOARD, SDLK_F12,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_F12),
+ emptyKey,
Input::GRP_GUICHAN | Input::GRP_CHAT,
nullptr,
InputAction::NO_VALUE, 50,
@@ -2813,8 +2755,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyWindowAbout",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ emptyKey,
+ emptyKey,
Input::GRP_DEFAULT | Input::GRP_GUI,
&Actions::aboutWindowShow,
InputAction::NO_VALUE, 50,
@@ -2822,8 +2764,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"about",
false},
{"keyWindowUpdater",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ emptyKey,
+ emptyKey,
Input::GRP_DEFAULT | Input::GRP_GUI,
&Actions::updaterWindowShow,
InputAction::NO_VALUE, 50,
@@ -2831,8 +2773,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"updater",
false},
{"keyTargetClosestMonster",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ emptyKey,
+ emptyKey,
Input::GRP_DEFAULT | Input::GRP_REPEAT,
&Actions::targetClosestMonster,
InputAction::NO_VALUE, 50,
@@ -2841,8 +2783,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"targetclosestmonster",
false},
{"keyChatCloseAllTabs",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ emptyKey,
+ emptyKey,
Input::GRP_DEFAULT | Input::GRP_GUI,
&Actions::closeAllChatTabs,
InputAction::NO_VALUE, 50,
@@ -2850,8 +2792,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"closeall",
false},
{"keyChatIgnoreAllWhispers",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ emptyKey,
+ emptyKey,
Input::GRP_DEFAULT | Input::GRP_GUI,
&Actions::ignoreAllWhispers,
InputAction::NO_VALUE, 50,
@@ -2859,8 +2801,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"ignoreallwhispers",
false},
{"keyChatAnnounce",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ emptyKey,
+ emptyKey,
Input::GRP_DEFAULT | Input::GRP_GUI,
&Actions::chatAnnounce,
InputAction::NO_VALUE, 50,
@@ -2868,575 +2810,323 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"announce",
true},
{"keyIpcToggle",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::ipcToggle,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::ipcToggle),
InputCondition::INGAME,
"ipctoggle",
false},
{"keyWhere",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::where,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::where),
InputCondition::INGAME,
"where",
false},
{"keyWho",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::who,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::who),
InputCondition::INGAME,
"who",
false},
{"keyWhisper",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::msg,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::msg),
InputCondition::INGAME,
"w|whisper|msg",
true},
{"keyQuery",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::query,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::query),
InputCondition::INGAME,
"q|query|j|join",
true},
{"keyClearChatTab",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::clearChatTab,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::clearChatTab),
InputCondition::INGAME,
"clear",
false},
{"keyIgnore",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::chatIgnore,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::chatIgnore),
InputCondition::INGAME,
"ignore",
true},
{"keyUnignore",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::chatUnignore,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::chatUnignore),
InputCondition::INGAME,
"unignore",
true},
{"keyFriend",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::chatFriend,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::chatFriend),
InputCondition::INGAME,
"friend|befriend",
true},
{"keyDisregard",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::chatDisregard,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::chatDisregard),
InputCondition::INGAME,
"disregard",
true},
{"keyNeutral",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::chatNeutral,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::chatNeutral),
InputCondition::INGAME,
"neutral",
true},
{"keyBlacklist",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::chatBlackList,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::chatBlackList),
InputCondition::INGAME,
"blacklist",
true},
{"keyEnemy",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::chatEnemy,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::chatEnemy),
InputCondition::INGAME,
"enemy",
true},
{"keyErase",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::chatErase,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::chatErase),
InputCondition::INGAME,
"erase",
true},
{"keyCleanGraphics",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::cleanGraphics,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::cleanGraphics),
InputCondition::INGAME,
"cleangraphics",
false},
{"keyCleanFonts",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::cleanFonts,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::cleanFonts),
InputCondition::INGAME,
"cleanfonts",
false},
{"keyCreateParty",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::createParty,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::createParty),
InputCondition::INGAME,
"createparty",
true},
{"keyCreateGuild",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::createGuild,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::createGuild),
InputCondition::INGAME,
"createguild",
true},
{"keyParty",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::party,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::party),
InputCondition::INGAME,
"party",
true},
{"keyMe",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::me,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::me),
InputCondition::INGAME,
"me",
true},
{"keyToggle",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::toggle,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::toggle),
InputCondition::INGAME,
"toggle",
false},
{"keyPresent",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::present,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::present),
InputCondition::INGAME,
"present",
false},
{"keyPrintAll",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::printAll,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::printAll),
InputCondition::INGAME,
"all",
false},
{"keyMove",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::move,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::move),
InputCondition::INGAME,
"move",
true},
{"keySetTarget",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::setTarget,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::setTarget),
InputCondition::INGAME,
"target",
true},
{"keyAttackHuman",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::attackHuman,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::attackHuman),
InputCondition::INGAME,
"atkhuman",
false},
{"keyOutfit",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::commandOutfit,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::commandOutfit),
InputCondition::INGAME,
"outfit",
true},
{"keyEmote",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::commandEmote,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::commandEmote),
InputCondition::INGAME,
"emote",
true},
{"keyEmotePet",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::commandEmotePet,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::commandEmotePet),
InputCondition::INGAME,
"emotepet",
true},
{"keyAwayMessage",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::awayMessage,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::awayMessage),
InputCondition::INGAME,
"away",
true},
{"keyPseudoAway",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::pseudoAway,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::pseudoAway),
InputCondition::INGAME,
"pseudoaway",
true},
{"keyFollow",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::follow,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::follow),
InputCondition::INGAME,
"follow",
true},
{"keyNavigate",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::navigate,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::navigate),
InputCondition::INGAME,
"navigate",
true},
{"keyImitation",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::imitation,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::imitation),
InputCondition::INGAME,
"imitation",
true},
{"keySendMail",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::sendMail,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::sendMail),
InputCondition::INGAME,
"mail",
true},
{"keyTradeCommand",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::trade,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::trade),
InputCondition::INGAME,
"trade",
true},
{"keyPriceLoad",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::priceLoad,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::priceLoad),
InputCondition::INGAME,
"priceload",
false},
{"keyPriceSave",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::priceSave,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::priceSave),
InputCondition::INGAME,
"pricesave",
false},
{"keyCacheInfo",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::cacheInfo,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::cacheInfo),
InputCondition::INGAME,
"cacheinfo",
false},
{"keyDisconnect",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::disconnect,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::disconnect),
InputCondition::INGAME,
"disconnect",
false},
{"keyUndress",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::undress,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::undress),
InputCondition::INGAME,
"undress",
true},
{"keyDirs",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::dirs,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::dirs),
InputCondition::INGAME,
"dirs",
false},
{"keyInfo",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::info,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::info),
InputCondition::INGAME,
"info",
false},
{"keyWait",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::wait,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::wait),
InputCondition::INGAME,
"wait",
true},
{"keyUptime",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::uptime,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::uptime),
InputCondition::INGAME,
"uptime",
false},
{"keyAddPriorityAttack",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::addPriorityAttack,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::addPriorityAttack),
InputCondition::INGAME,
"addpriorityattack",
true},
{"keyAddAttack",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::addAttack,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::addAttack),
InputCondition::INGAME,
"addattack",
true},
{"keyRemoveAttack",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::removeAttack,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::removeAttack),
InputCondition::INGAME,
"removeattack|removeignoreattack",
true},
{"keyAddIgnoreAttack",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::addIgnoreAttack,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::addIgnoreAttack),
InputCondition::INGAME,
"addignoreattack",
true},
{"keyDump",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::dump,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::dump),
InputCondition::INGAME,
"dump",
false},
{"keyServerIgnoreAll",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::serverIgnoreAll,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::serverIgnoreAll),
InputCondition::INGAME,
"serverignoreall",
false},
{"keyServerUnIgnoreAll",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::serverUnIgnoreAll,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::serverUnIgnoreAll),
InputCondition::INGAME,
"serverunignoreall",
false},
{"keySetDrop",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::setDrop,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::setDrop),
InputCondition::INGAME,
"setdrop",
true},
{"keyError",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::error,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::error),
InputCondition::INGAME,
"error",
false},
{"keyDumpg",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::dumpGraphics,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::dumpGraphics),
InputCondition::INGAME,
"dumpg",
false},
{"keyDumpe",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::dumpEnvironment,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::dumpEnvironment),
InputCondition::INGAME,
"dumpe",
false},
{"keyDumpt",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::dumpTests,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::dumpTests),
InputCondition::INGAME,
"dumpt",
false},
{"keyDumpOGL",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::dumpOGL,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::dumpOGL),
InputCondition::INGAME,
"dumpogl",
false},
{"keyDumpGL",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::dumpGL,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::dumpGL),
InputCondition::INGAME,
"dumpgl",
false},
{"keyDumpMods",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::dumpMods,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::dumpMods),
InputCondition::INGAME,
"dumpMods",
false},
{"keyUrl",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::url,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::url),
InputCondition::INGAME,
"url",
true},
{"keyOpenUrl",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::openUrl,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::openUrl),
InputCondition::INGAME,
"open",
true},
{"keyExecute",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::execute,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::execute),
InputCondition::INGAME,
"execute",
true},
{"keyTestSdlFont",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ emptyKey,
+ emptyKey,
Input::GRP_DEFAULT,
#if defined USE_OPENGL && defined DEBUG_SDLFONT
&Actions::testSdlFont,
@@ -3452,161 +3142,93 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
#endif
false},
{"keyEnableHightlight",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::enableHighlight,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::enableHighlight),
InputCondition::INGAME,
"enablehighlight",
false},
{"keyDisableHightlight",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::disableHighlight,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::disableHighlight),
InputCondition::INGAME,
"disablehighlight",
false},
{"keyDontRemoveName",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::dontRemoveName,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::dontRemoveName),
InputCondition::INGAME,
"dontremovename",
false},
{"keyRemoveName",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::removeName,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::removeName),
InputCondition::INGAME,
"removename",
false},
{"keyDisableAway",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::disableAway,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::disableAway),
InputCondition::INGAME,
"disableaway",
false},
{"keyEnableAway",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::enableAway,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::enableAway),
InputCondition::INGAME,
"enableaway",
false},
{"keyTestParticle",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::testParticle,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::testParticle),
InputCondition::INGAME,
"testparticle",
true},
{"keyCreateItems",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::createItems,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::createItems),
InputCondition::INGAME,
"createitems",
false},
{"keyTalkRaw",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::talkRaw,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::talkRaw),
InputCondition::INGAME,
"talkraw",
true},
{"keyTalkPet",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::talkPet,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::talkPet),
InputCondition::INGAME,
"talkpet",
true},
{"keyUploadConfig",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::uploadConfig,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::uploadConfig),
InputCondition::INGAME,
"uploadconfig",
false},
{"keyUploadServerConfig",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::uploadServerConfig,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::uploadServerConfig),
InputCondition::INGAME,
"uploadserverconfig",
false},
{"keyUploadLog",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::uploadLog,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::uploadLog),
InputCondition::INGAME,
"uploadlog",
false},
{"keyGm",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::gm,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::gm),
InputCondition::INGAME,
"gm",
true},
{"keyHack",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::hack,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::hack),
InputCondition::INGAME,
"hack",
true},
{"keyDebugSpawn",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::debugSpawn,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::debugSpawn),
InputCondition::INGAME,
"debugspawn",
true},
{"keyPetSmilie",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- nullptr,
- InputAction::NO_VALUE, 50,
+ defaultAction(nullptr),
InputCondition::DEFAULT | InputCondition::INGAME,
"",
false},
{"keyPetEmoteShortcut1",
- InputType::KEYBOARD, SDLK_1,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_1),
+ emptyKey,
Input::GRP_PET_EMOTION,
&Actions::petEmote,
InputAction::PET_EMOTE, 100,
@@ -3614,8 +3236,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyPetEmoteShortcut2",
- InputType::KEYBOARD, SDLK_2,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_2),
+ emptyKey,
Input::GRP_PET_EMOTION,
&Actions::petEmote,
InputAction::PET_EMOTE, 100,
@@ -3623,8 +3245,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyPetEmoteShortcut3",
- InputType::KEYBOARD, SDLK_3,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_3),
+ emptyKey,
Input::GRP_PET_EMOTION,
&Actions::petEmote,
InputAction::PET_EMOTE, 100,
@@ -3632,8 +3254,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyPetEmoteShortcut4",
- InputType::KEYBOARD, SDLK_4,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_4),
+ emptyKey,
Input::GRP_PET_EMOTION,
&Actions::petEmote,
InputAction::PET_EMOTE, 100,
@@ -3641,8 +3263,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyPetEmoteShortcut5",
- InputType::KEYBOARD, SDLK_5,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_5),
+ emptyKey,
Input::GRP_PET_EMOTION,
&Actions::petEmote,
InputAction::PET_EMOTE, 100,
@@ -3650,8 +3272,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyPetEmoteShortcut6",
- InputType::KEYBOARD, SDLK_6,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_6),
+ emptyKey,
Input::GRP_PET_EMOTION,
&Actions::petEmote,
InputAction::PET_EMOTE, 100,
@@ -3659,8 +3281,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyPetEmoteShortcut7",
- InputType::KEYBOARD, SDLK_7,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_7),
+ emptyKey,
Input::GRP_PET_EMOTION,
&Actions::petEmote,
InputAction::PET_EMOTE, 100,
@@ -3668,8 +3290,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyPetEmoteShortcut8",
- InputType::KEYBOARD, SDLK_8,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_8),
+ emptyKey,
Input::GRP_PET_EMOTION,
&Actions::petEmote,
InputAction::PET_EMOTE, 100,
@@ -3677,8 +3299,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyPetEmoteShortcut9",
- InputType::KEYBOARD, SDLK_9,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_9),
+ emptyKey,
Input::GRP_PET_EMOTION,
&Actions::petEmote,
InputAction::PET_EMOTE, 100,
@@ -3686,8 +3308,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyPetEmoteShortcut10",
- InputType::KEYBOARD, SDLK_0,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_0),
+ emptyKey,
Input::GRP_PET_EMOTION,
&Actions::petEmote,
InputAction::PET_EMOTE, 100,
@@ -3695,8 +3317,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyPetEmoteShortcut11",
- InputType::KEYBOARD, SDLK_MINUS,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_MINUS),
+ emptyKey,
Input::GRP_PET_EMOTION,
&Actions::petEmote,
InputAction::PET_EMOTE, 100,
@@ -3704,8 +3326,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyPetEmoteShortcut12",
- InputType::KEYBOARD, SDLK_EQUALS,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_EQUALS),
+ emptyKey,
Input::GRP_PET_EMOTION,
&Actions::petEmote,
InputAction::PET_EMOTE, 100,
@@ -3713,8 +3335,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyPetEmoteShortcut13",
- InputType::KEYBOARD, SDLK_BACKSPACE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_BACKSPACE),
+ emptyKey,
Input::GRP_PET_EMOTION,
&Actions::petEmote,
InputAction::PET_EMOTE, 100,
@@ -3722,8 +3344,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyPetEmoteShortcut14",
- InputType::KEYBOARD, SDLK_INSERT,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_INSERT),
+ emptyKey,
Input::GRP_PET_EMOTION,
&Actions::petEmote,
InputAction::PET_EMOTE, 100,
@@ -3731,8 +3353,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyPetEmoteShortcut15",
- InputType::KEYBOARD, SDLK_HOME,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_HOME),
+ emptyKey,
Input::GRP_PET_EMOTION,
&Actions::petEmote,
InputAction::PET_EMOTE, 100,
@@ -3740,8 +3362,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyPetEmoteShortcut16",
- InputType::KEYBOARD, SDLK_q,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_q),
+ emptyKey,
Input::GRP_PET_EMOTION,
&Actions::petEmote,
InputAction::PET_EMOTE, 100,
@@ -3749,8 +3371,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyPetEmoteShortcut17",
- InputType::KEYBOARD, SDLK_w,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_w),
+ emptyKey,
Input::GRP_PET_EMOTION,
&Actions::petEmote,
InputAction::PET_EMOTE, 100,
@@ -3758,8 +3380,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyPetEmoteShortcut18",
- InputType::KEYBOARD, SDLK_e,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_e),
+ emptyKey,
Input::GRP_PET_EMOTION,
&Actions::petEmote,
InputAction::PET_EMOTE, 100,
@@ -3767,8 +3389,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyPetEmoteShortcut19",
- InputType::KEYBOARD, SDLK_r,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_r),
+ emptyKey,
Input::GRP_PET_EMOTION,
&Actions::petEmote,
InputAction::PET_EMOTE, 100,
@@ -3776,8 +3398,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyPetEmoteShortcut20",
- InputType::KEYBOARD, SDLK_t,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_t),
+ emptyKey,
Input::GRP_PET_EMOTION,
&Actions::petEmote,
InputAction::PET_EMOTE, 100,
@@ -3785,8 +3407,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyPetEmoteShortcut21",
- InputType::KEYBOARD, SDLK_y,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_y),
+ emptyKey,
Input::GRP_PET_EMOTION,
&Actions::petEmote,
InputAction::PET_EMOTE, 100,
@@ -3794,8 +3416,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyPetEmoteShortcut22",
- InputType::KEYBOARD, SDLK_u,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_u),
+ emptyKey,
Input::GRP_PET_EMOTION,
&Actions::petEmote,
InputAction::PET_EMOTE, 100,
@@ -3803,8 +3425,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyPetEmoteShortcut23",
- InputType::KEYBOARD, SDLK_i,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_i),
+ emptyKey,
Input::GRP_PET_EMOTION,
&Actions::petEmote,
InputAction::PET_EMOTE, 100,
@@ -3812,8 +3434,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyPetEmoteShortcut24",
- InputType::KEYBOARD, SDLK_o,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_o),
+ emptyKey,
Input::GRP_PET_EMOTION,
&Actions::petEmote,
InputAction::PET_EMOTE, 100,
@@ -3821,8 +3443,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyPetEmoteShortcut25",
- InputType::KEYBOARD, SDLK_p,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_p),
+ emptyKey,
Input::GRP_PET_EMOTION,
&Actions::petEmote,
InputAction::PET_EMOTE, 100,
@@ -3830,8 +3452,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyPetEmoteShortcut26",
- InputType::KEYBOARD, SDLK_LEFTBRACKET,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_LEFTBRACKET),
+ emptyKey,
Input::GRP_PET_EMOTION,
&Actions::petEmote,
InputAction::PET_EMOTE, 100,
@@ -3839,8 +3461,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyPetEmoteShortcut27",
- InputType::KEYBOARD, SDLK_RIGHTBRACKET,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_RIGHTBRACKET),
+ emptyKey,
Input::GRP_PET_EMOTION,
&Actions::petEmote,
InputAction::PET_EMOTE, 100,
@@ -3848,8 +3470,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyPetEmoteShortcut28",
- InputType::KEYBOARD, SDLK_BACKSLASH,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_BACKSLASH),
+ emptyKey,
Input::GRP_PET_EMOTION,
&Actions::petEmote,
InputAction::PET_EMOTE, 100,
@@ -3857,8 +3479,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyPetEmoteShortcut29",
- InputType::KEYBOARD, SDLK_a,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_a),
+ emptyKey,
Input::GRP_PET_EMOTION,
&Actions::petEmote,
InputAction::PET_EMOTE, 100,
@@ -3866,8 +3488,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyPetEmoteShortcut30",
- InputType::KEYBOARD, SDLK_s,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_s),
+ emptyKey,
Input::GRP_PET_EMOTION,
&Actions::petEmote,
InputAction::PET_EMOTE, 100,
@@ -3875,8 +3497,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyPetEmoteShortcut31",
- InputType::KEYBOARD, SDLK_d,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_d),
+ emptyKey,
Input::GRP_PET_EMOTION,
&Actions::petEmote,
InputAction::PET_EMOTE, 100,
@@ -3884,8 +3506,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyPetEmoteShortcut32",
- InputType::KEYBOARD, SDLK_f,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_f),
+ emptyKey,
Input::GRP_PET_EMOTION,
&Actions::petEmote,
InputAction::PET_EMOTE, 100,
@@ -3893,8 +3515,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyPetEmoteShortcut33",
- InputType::KEYBOARD, SDLK_g,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_g),
+ emptyKey,
Input::GRP_PET_EMOTION,
&Actions::petEmote,
InputAction::PET_EMOTE, 100,
@@ -3902,8 +3524,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyPetEmoteShortcut34",
- InputType::KEYBOARD, SDLK_h,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_h),
+ emptyKey,
Input::GRP_PET_EMOTION,
&Actions::petEmote,
InputAction::PET_EMOTE, 100,
@@ -3911,8 +3533,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyPetEmoteShortcut35",
- InputType::KEYBOARD, SDLK_j,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_j),
+ emptyKey,
Input::GRP_PET_EMOTION,
&Actions::petEmote,
InputAction::PET_EMOTE, 100,
@@ -3920,8 +3542,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyPetEmoteShortcut36",
- InputType::KEYBOARD, SDLK_k,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_k),
+ emptyKey,
Input::GRP_PET_EMOTION,
&Actions::petEmote,
InputAction::PET_EMOTE, 100,
@@ -3929,8 +3551,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyPetEmoteShortcut37",
- InputType::KEYBOARD, SDLK_l,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_l),
+ emptyKey,
Input::GRP_PET_EMOTION,
&Actions::petEmote,
InputAction::PET_EMOTE, 100,
@@ -3938,8 +3560,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyPetEmoteShortcut38",
- InputType::KEYBOARD, SDLK_SEMICOLON,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_SEMICOLON),
+ emptyKey,
Input::GRP_PET_EMOTION,
&Actions::petEmote,
InputAction::PET_EMOTE, 100,
@@ -3947,8 +3569,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyPetEmoteShortcut39",
- InputType::KEYBOARD, SDLK_QUOTE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_QUOTE),
+ emptyKey,
Input::GRP_PET_EMOTION,
&Actions::petEmote,
InputAction::PET_EMOTE, 100,
@@ -3956,8 +3578,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyPetEmoteShortcut40",
- InputType::KEYBOARD, SDLK_z,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_z),
+ emptyKey,
Input::GRP_PET_EMOTION,
&Actions::petEmote,
InputAction::PET_EMOTE, 100,
@@ -3965,8 +3587,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyPetEmoteShortcut41",
- InputType::KEYBOARD, SDLK_x,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_x),
+ emptyKey,
Input::GRP_PET_EMOTION,
&Actions::petEmote,
InputAction::PET_EMOTE, 100,
@@ -3974,8 +3596,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyPetEmoteShortcut42",
- InputType::KEYBOARD, SDLK_c,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_c),
+ emptyKey,
Input::GRP_PET_EMOTION,
&Actions::petEmote,
InputAction::PET_EMOTE, 100,
@@ -3983,8 +3605,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyPetEmoteShortcut43",
- InputType::KEYBOARD, SDLK_v,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_v),
+ emptyKey,
Input::GRP_PET_EMOTION,
&Actions::petEmote,
InputAction::PET_EMOTE, 100,
@@ -3992,8 +3614,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyPetEmoteShortcut44",
- InputType::KEYBOARD, SDLK_b,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_b),
+ emptyKey,
Input::GRP_PET_EMOTION,
&Actions::petEmote,
InputAction::PET_EMOTE, 100,
@@ -4001,8 +3623,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyPetEmoteShortcut45",
- InputType::KEYBOARD, SDLK_n,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_n),
+ emptyKey,
Input::GRP_PET_EMOTION,
&Actions::petEmote,
InputAction::PET_EMOTE, 100,
@@ -4010,8 +3632,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyPetEmoteShortcut46",
- InputType::KEYBOARD, SDLK_m,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_m),
+ emptyKey,
Input::GRP_PET_EMOTION,
&Actions::petEmote,
InputAction::PET_EMOTE, 100,
@@ -4019,8 +3641,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyPetEmoteShortcut47",
- InputType::KEYBOARD, SDLK_COMMA,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_COMMA),
+ emptyKey,
Input::GRP_PET_EMOTION,
&Actions::petEmote,
InputAction::PET_EMOTE, 100,
@@ -4028,8 +3650,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyPetEmoteShortcut48",
- InputType::KEYBOARD, SDLK_PERIOD,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ addKey(SDLK_PERIOD),
+ emptyKey,
Input::GRP_PET_EMOTION,
&Actions::petEmote,
InputAction::PET_EMOTE, 100,
@@ -4037,17 +3659,13 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"",
false},
{"keyCatchPet",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::catchPet,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::catchPet),
InputCondition::INGAME,
"catchpet|catch",
true},
{"keyChatServerIgnoreWhisper",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ emptyKey,
+ emptyKey,
Input::GRP_DEFAULT | Input::GRP_GUI,
&Actions::serverIgnoreWhisper,
InputAction::NO_VALUE, 50,
@@ -4055,8 +3673,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"serverignore",
false},
{"keyChatServerUnIgnoreWhisper",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ emptyKey,
+ emptyKey,
Input::GRP_DEFAULT | Input::GRP_GUI,
&Actions::serverUnIgnoreWhisper,
InputAction::NO_VALUE, 50,
@@ -4064,62 +3682,38 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"serverunignore",
false},
{"keyMercenaryFire",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::mercenaryFire,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::mercenaryFire),
InputCondition::INGAME,
"mercenaryfire|firemercenary",
false},
{"keyTargetMercenary",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::targetMercenary,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::targetMercenary),
InputCondition::INGAME | InputCondition::NOTARGET,
"targetmercenary",
false},
{"keyTargetPet",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::targetPet,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::targetPet),
InputCondition::INGAME | InputCondition::NOTARGET,
"targetpet",
false},
{"keyPetSetName",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::setPetName,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::setPetName),
InputCondition::INGAME,
"setpetname|petsetname",
false},
{"keyHomunculusSetName",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::setHomunculusName,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::setHomunculusName),
InputCondition::INGAME,
"sethomunname|homunsetname|sethomunculusname|homunculussetname",
false},
{"keyHomunculusFire",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::fireHomunculus,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::fireHomunculus),
InputCondition::INGAME,
"firehomunculus|homunculusfire",
false},
{"keyWindowBank",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ emptyKey,
+ emptyKey,
Input::GRP_DEFAULT | Input::GRP_GUI,
&Actions::bankWindowShow,
InputAction::NO_VALUE, 50,
@@ -4127,8 +3721,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"bank|openbank",
false},
{"keyInventoryPrevTab",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ emptyKey,
+ emptyKey,
Input::GRP_DEFAULT | Input::GRP_GUI,
&Actions::prevInvTab,
InputAction::NO_VALUE, 50,
@@ -4136,8 +3730,8 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"previnvtab",
false},
{"keyInventoryNextTab",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
+ emptyKey,
+ emptyKey,
Input::GRP_DEFAULT | Input::GRP_GUI,
&Actions::nextInvTab,
InputAction::NO_VALUE, 50,
@@ -4145,339 +3739,195 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
"nextinvtab",
false},
{"keyContextMenu",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::contextMenu,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::contextMenu),
InputCondition::NOINPUT | InputCondition::NOAWAY
| InputCondition::NOMODAL | InputCondition::INGAME,
"contextmenu",
false},
{"keyBuy",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::buy,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::buy),
InputCondition::GAME,
"buy",
false},
{"keySell",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::sell,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::sell),
InputCondition::GAME,
"sell",
false},
{"keyWhisper2",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::msg2,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::msg2),
InputCondition::INGAME,
"w2|whisper2|msg2",
true},
{"keyGuild",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::guild,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::guild),
InputCondition::INGAME,
"guild",
true},
{"keyNuke",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::chatNuke,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::chatNuke),
InputCondition::INGAME,
"nuke",
true},
{"keyUse",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::useItem,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::useItem),
InputCondition::INGAME,
"use|useitem",
true},
{"keyChatAdd",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::chatAdd,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::chatAdd),
InputCondition::INGAME,
"addchat|chatadd",
true},
{"keyWhisperText",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::msgText,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::msgText),
InputCondition::INGAME,
"wt|whispertext|msgtext",
true},
{"keyNavigateTo",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::navigateTo,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::navigateTo),
InputCondition::INGAME,
"navigateto",
true},
{"keyCameraMove",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::moveCamera,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::moveCamera),
InputCondition::INGAME,
"movecamera|cameramove",
true},
{"keyDropItem",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::dropItemId,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::dropItemId),
InputCondition::INGAME,
"dropitem",
true},
{"keyDropItemAll",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::dropItemIdAll,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::dropItemIdAll),
InputCondition::INGAME,
"dropitemall",
true},
{"keyDropInv",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::dropItemInv,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::dropItemInv),
InputCondition::INGAME,
"dropinv",
true},
{"keyDropInvAll",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::dropItemInvAll,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::dropItemInvAll),
InputCondition::INGAME,
"dropinvall",
true},
{"keyUseInv",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::useItemInv,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::useItemInv),
InputCondition::INGAME,
"useinv",
true},
{"keyInvToStorage",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::invToStorage,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::invToStorage),
InputCondition::INGAME,
"invtostorage|invstorage",
true},
{"keyTradeAdd",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::tradeAdd,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::tradeAdd),
InputCondition::INGAME,
"tradeadd|addtrade",
true},
{"keyStorageToInv",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::storageToInv,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::storageToInv),
InputCondition::INGAME,
"storagetoinv|storageinv",
true},
{"keyProtectItem",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::protectItem,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::protectItem),
InputCondition::INGAME,
"protectitem|itemprotect",
true},
{"keyUnProtectItem",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::unprotectItem,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::unprotectItem),
InputCondition::INGAME,
"unprotectitem|itemunprotect",
true},
{"keyKickParty",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::kickParty,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::kickParty),
InputCondition::INGAME,
"kickparty|partykick",
true},
{"keyAddText",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::addText,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::addText),
InputCondition::INGAME,
"addtext|textadd",
true},
{"keyKick",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::kick,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::kick),
InputCondition::INGAME,
"kick",
true},
{"keyLeaveParty",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::leaveParty,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::leaveParty),
InputCondition::INGAME,
"leaveparty|partyleave",
true},
{"keyWarp",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::warp,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::warp),
InputCondition::INGAME,
"warp",
true},
{"keyClearChat",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::clearChat,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::clearChat),
InputCondition::INGAME,
"clearchat|chatclear",
false},
{"keyPetMoveUp",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::petMoveUp,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::petMoveUp),
InputCondition::INGAME,
"petmoveup|moveuppet",
false},
{"keyPetMoveDown",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::petMoveDown,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::petMoveDown),
InputCondition::INGAME,
"petmovedown|movedownpet",
false},
{"keyPetMoveLeft",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::petMoveLeft,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::petMoveLeft),
InputCondition::INGAME,
"petmoveleft|moveleftpet",
false},
{"keyPetMoveRight",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::petMoveRight,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::petMoveRight),
InputCondition::INGAME,
"petmoveright|moverightpet",
false},
{"keyPetDirectUp",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::petDirectUp,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::petDirectUp),
InputCondition::INGAME,
"petdirectup|directuppet",
false},
{"keyPetDirectDown",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::petDirectDown,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::petDirectDown),
InputCondition::INGAME,
"petdirectdown|directdownpet",
false},
{"keyPetDirectLeft",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::petDirectLeft,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::petDirectLeft),
InputCondition::INGAME,
"petdirectleft|directleftpet",
false},
{"keyPetDirectRight",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::petDirectRight,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::petDirectRight),
InputCondition::INGAME,
"petdirectright|directrightpet",
false},
{"keyPetAiStart",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::petAiStart,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::petAiStart),
InputCondition::INGAME,
- "petaistart|startpetai",
+ "petaistart|startpetai|enablepetai|petaienable",
false},
{"keyPetAiStop",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::petAiStop,
- InputAction::NO_VALUE, 50,
+ defaultAction(&Actions::petAiStop),
InputCondition::INGAME,
- "petaistop|stoppetai",
+ "petaistop|stoppetai|disablepetai|petaidisable",
false},
};
+#undef defaultAction
+#undef addKey
+#undef joystickButton
+
#endif // INPUT_INPUTACTIONMAP_H
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-10 04:39:45 +0000