From 0c9190e17be10e513d89d15aa29c1aab84124af7 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 10 May 2015 13:42:08 +0300 Subject: Add strong typed bool type UseArgs. --- src/input/inputactiondata.h | 4 +- src/input/inputactionmap.h | 1122 +++++++++++++++++++++---------------------- src/input/inputmanager.cpp | 2 +- 3 files changed, 565 insertions(+), 563 deletions(-) (limited to 'src/input') diff --git a/src/input/inputactiondata.h b/src/input/inputactiondata.h index 76a04afc1..dc2ada642 100644 --- a/src/input/inputactiondata.h +++ b/src/input/inputactiondata.h @@ -25,6 +25,8 @@ #include "actions/actionfuncptr.h" +#include "enums/simpletypes.h" + struct InputActionData final { const char *const configField; @@ -38,7 +40,7 @@ struct InputActionData final const int priority; const int condition; const std::string chatCommand; - const bool useArgs; + const UseArgs useArgs; }; namespace Input diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h index d247da765..cd57e47a7 100644 --- a/src/input/inputactionmap.h +++ b/src/input/inputactionmap.h @@ -63,7 +63,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::ARROWKEYS, "", - false}, + UseArgs_false}, {"keyMoveDown", addKey(SDLK_DOWN), emptyKey, @@ -72,7 +72,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::ARROWKEYS, "", - false}, + UseArgs_false}, {"keyMoveLeft", addKey(SDLK_LEFT), emptyKey, @@ -81,7 +81,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::ARROWKEYS, "", - false}, + UseArgs_false}, {"keyMoveRight", addKey(SDLK_RIGHT), emptyKey, @@ -90,7 +90,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::ARROWKEYS, "", - false}, + UseArgs_false}, {"keyAttack", addKey(SDLK_x), emptyKey, @@ -100,7 +100,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputCondition::GAME | InputCondition::NOFOLLOW | InputCondition::VALIDSPEED, "attack", - false}, + UseArgs_false}, {"keyTargetAttack", addKey(SDLK_LCTRL), joystickButton(0), @@ -110,7 +110,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputCondition::GAME | InputCondition::NOFOLLOW | InputCondition::VALIDSPEED | InputCondition::ALIVE, "targetattack", - true}, + UseArgs_true}, {"keyMoveToTarget", addKey(SDLK_v), emptyKey, @@ -119,7 +119,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::VALIDSPEED, "movetotarget", - false}, + UseArgs_false}, {"keyChangeMoveToTarget", addKey(SDLK_PERIOD), emptyKey, @@ -129,7 +129,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputCondition::GAME | InputCondition::VALIDSPEED | InputCondition::EMODS, "", - false}, + UseArgs_false}, {"keyMoveToHome", addKey(SDLK_d), emptyKey, @@ -138,7 +138,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::VALIDSPEED, "movetohome", - false}, + UseArgs_false}, {"keySetHome", addKey(SDLK_KP5), emptyKey, @@ -147,7 +147,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::VALIDSPEED, "sethome", - false}, + UseArgs_false}, {"keyMoveToPoint", addKey(SDLK_RSHIFT), emptyKey, @@ -156,7 +156,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::DEFAULT | InputCondition::INGAME, "", - false}, + UseArgs_false}, {"keyTalk", addKey(SDLK_t), emptyKey, @@ -165,7 +165,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::GAME, "talk", - false}, + UseArgs_false}, {"keyTarget", addKey(SDLK_LSHIFT), joystickButton(4), @@ -174,12 +174,12 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::GAME, "stopattack", - false}, + UseArgs_false}, {"keyUnTarget", defaultAction(&Actions::untarget), InputCondition::GAME, "untarget", - false}, + UseArgs_false}, {"keyTargetMonster", addKey(SDLK_a), joystickButton(3), @@ -189,7 +189,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputCondition::GAME | InputCondition::NOTARGET | InputCondition::VALIDSPEED, "targetmonster", - false}, + UseArgs_false}, {"keyTargetNPC", addKey(SDLK_n), emptyKey, @@ -198,7 +198,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::NOTARGET, "targetnpc", - false}, + UseArgs_false}, {"keyTargetPlayer", addKey(SDLK_q), emptyKey, @@ -207,7 +207,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::NOTARGET, "targetplayer", - false}, + UseArgs_false}, {"keyPickup", addKey(SDLK_z), joystickButton(1), @@ -216,7 +216,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::NOTARGET, "pickup", - false}, + UseArgs_false}, {"keyChangePickupType", addKey(SDLK_o), emptyKey, @@ -226,7 +226,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputCondition::GAME | InputCondition::VALIDSPEED | InputCondition::EMODS, "", - false}, + UseArgs_false}, {"keyHideWindows", addKey(SDLK_h), emptyKey, @@ -235,7 +235,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::NOTARGET, "hidewindows", - false}, + UseArgs_false}, {"keyBeingSit", addKey(SDLK_s), joystickButton(2), @@ -244,7 +244,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::NOTARGET, "sit", - false}, + UseArgs_false}, {"keyScreenshot", addKey(SDLK_p), emptyKey, @@ -253,7 +253,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::NOTARGET | InputCondition::NOINPUT, "screenshot", - false}, + UseArgs_false}, {"keyTrade", addKey(SDLK_r), emptyKey, @@ -262,7 +262,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::NOTARGET, "changetrade", - false}, + UseArgs_false}, {"keyPathfind", addKey(SDLK_f), emptyKey, @@ -272,7 +272,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputCondition::GAME | InputCondition::NOTARGET | InputCondition::EMODS, "", - false}, + UseArgs_false}, {"keyOK", addKey(SDLK_SPACE), emptyKey, @@ -282,7 +282,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputCondition::NOMODAL | InputCondition::NOAWAY | InputCondition::NONPCINPUT, "", - false}, + UseArgs_false}, {"keyQuit", addKey(SDLK_ESCAPE), #if defined(USE_SDL2) && defined(ANDROID) @@ -295,7 +295,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::DEFAULT, "quit", - false}, + UseArgs_false}, {"keyShortcutsKey", addKey(SDLK_MENU), emptyKey, @@ -304,7 +304,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::DEFAULT | InputCondition::INGAME, "", - false}, + UseArgs_false}, {"keyShortcut1", addKey(SDLK_1), emptyKey, @@ -313,7 +313,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::SHORTCUT, "", - false}, + UseArgs_false}, {"keyShortcut2", addKey(SDLK_2), emptyKey, @@ -322,7 +322,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::SHORTCUT, "", - false}, + UseArgs_false}, {"keyShortcut3", addKey(SDLK_3), emptyKey, @@ -331,7 +331,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::SHORTCUT, "", - false}, + UseArgs_false}, {"keyShortcut4", addKey(SDLK_4), emptyKey, @@ -340,7 +340,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::SHORTCUT, "", - false}, + UseArgs_false}, {"keyShortcut5", addKey(SDLK_5), emptyKey, @@ -349,7 +349,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::SHORTCUT, "", - false}, + UseArgs_false}, {"keyShortcut6", addKey(SDLK_6), emptyKey, @@ -358,7 +358,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::SHORTCUT, "", - false}, + UseArgs_false}, {"keyShortcut7", addKey(SDLK_7), emptyKey, @@ -367,7 +367,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::SHORTCUT, "", - false}, + UseArgs_false}, {"keyShortcut8", addKey(SDLK_8), emptyKey, @@ -376,7 +376,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::SHORTCUT, "", - false}, + UseArgs_false}, {"keyShortcut9", addKey(SDLK_9), emptyKey, @@ -385,7 +385,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::SHORTCUT, "", - false}, + UseArgs_false}, {"keyShortcut10", addKey(SDLK_0), emptyKey, @@ -394,7 +394,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::SHORTCUT, "", - false}, + UseArgs_false}, {"keyShortcut11", addKey(SDLK_MINUS), emptyKey, @@ -403,7 +403,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::SHORTCUT, "", - false}, + UseArgs_false}, {"keyShortcut12", addKey(SDLK_EQUALS), emptyKey, @@ -412,7 +412,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::SHORTCUT, "", - false}, + UseArgs_false}, {"keyShortcut13", addKey(SDLK_BACKSPACE), emptyKey, @@ -421,7 +421,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::SHORTCUT, "", - false}, + UseArgs_false}, {"keyShortcut14", addKey(SDLK_INSERT), emptyKey, @@ -430,7 +430,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::SHORTCUT, "", - false}, + UseArgs_false}, {"keyShortcut15", addKey(SDLK_HOME), emptyKey, @@ -439,32 +439,32 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::SHORTCUT, "", - false}, + UseArgs_false}, {"keyShortcut16", defaultAction(&Actions::shortcut), InputCondition::SHORTCUT, "", - false}, + UseArgs_false}, {"keyShortcut17", defaultAction(&Actions::shortcut), InputCondition::SHORTCUT, "", - false}, + UseArgs_false}, {"keyShortcut18", defaultAction(&Actions::shortcut), InputCondition::SHORTCUT, "", - false}, + UseArgs_false}, {"keyShortcut19", defaultAction(&Actions::shortcut), InputCondition::SHORTCUT, "", - false}, + UseArgs_false}, {"keyShortcut20", defaultAction(&Actions::shortcut), InputCondition::SHORTCUT, "", - false}, + UseArgs_false}, {"keyWindowHelp", addKey(SDLK_F1), emptyKey, @@ -473,7 +473,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::SHORTCUT0, "help|openhelp", - false}, + UseArgs_false}, {"keyWindowStatus", addKey(SDLK_F2), emptyKey, @@ -482,7 +482,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::NOTARGET, "status|openstatus", - false}, + UseArgs_false}, {"keyWindowInventory", addKey(SDLK_F3), emptyKey, @@ -491,7 +491,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::NOTARGET, "inventory|openinventory", - false}, + UseArgs_false}, {"keyWindowEquipment", addKey(SDLK_F4), emptyKey, @@ -500,7 +500,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::NOTARGET, "equipment|openequipment", - false}, + UseArgs_false}, {"keyWindowSkill", addKey(SDLK_F5), emptyKey, @@ -509,7 +509,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::NOTARGET, "skill|skills|openskills", - false}, + UseArgs_false}, {"keyWindowMinimap", addKey(SDLK_F6), emptyKey, @@ -518,7 +518,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::NOTARGET, "minimap|openminimap", - false}, + UseArgs_false}, {"keyWindowChat", addKey(SDLK_F7), emptyKey, @@ -527,7 +527,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::NOTARGET, "openchat", - false}, + UseArgs_false}, {"keyWindowShortcut", addKey(SDLK_F8), emptyKey, @@ -536,7 +536,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::NOTARGET, "openshortcut|openshortcuts", - false}, + UseArgs_false}, {"keyWindowSetup", addKey(SDLK_F9), emptyKey, @@ -546,7 +546,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputCondition::NOTARGET | InputCondition::NOINPUT | InputCondition::ENABLED, "setup|opensetup", - false}, + UseArgs_false}, {"keyWindowDebug", addKey(SDLK_F10), emptyKey, @@ -555,7 +555,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::NOTARGET, "debug|opendebug", - false}, + UseArgs_false}, {"keyWindowSocial", addKey(SDLK_F11), emptyKey, @@ -564,7 +564,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::NOTARGET, "social|opensocial", - false}, + UseArgs_false}, {"keyWindowEmoteBar", addKey(SDLK_F12), emptyKey, @@ -573,7 +573,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::NOTARGET, "emotes|openemotes", - false}, + UseArgs_false}, {"keyWindowOutfit", addKey(SDLK_BACKQUOTE), emptyKey, @@ -582,7 +582,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::NOTARGET, "openoutfit|openoutfits", - false}, + UseArgs_false}, {"keyWindowShop", emptyKey, emptyKey, @@ -591,7 +591,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::NOTARGET, "shop|openshop", - false}, + UseArgs_false}, {"keyWindowDrop", addKey(SDLK_w), emptyKey, @@ -600,7 +600,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::NOTARGET, "opendrop", - false}, + UseArgs_false}, {"keyWindowKills", addKey(SDLK_e), emptyKey, @@ -609,7 +609,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::NOTARGET, "kills|openkills", - false}, + UseArgs_false}, {"keyWindowSpells", addKey(SDLK_j), emptyKey, @@ -618,7 +618,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::NOTARGET, "spells|openspells", - false}, + UseArgs_false}, {"keyWindowBotChecker", emptyKey, emptyKey, @@ -627,7 +627,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::NOTARGET, "", - false}, + UseArgs_false}, {"keyWindowOnline", emptyKey, emptyKey, @@ -636,7 +636,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::NOTARGET, "online|openonline", - false}, + UseArgs_false}, {"keyWindowDidYouKnow", emptyKey, emptyKey, @@ -645,7 +645,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::SHORTCUT0, "didyouknow|opendidyouknow", - false}, + UseArgs_false}, {"keyWindowQuests", addKey(SDLK_LEFTBRACKET), emptyKey, @@ -654,7 +654,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::NOTARGET, "quests|openquests", - false}, + UseArgs_false}, {"keySocialPrevTab", emptyKey, emptyKey, @@ -663,7 +663,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::NOINPUT | InputCondition::INGAME, "prevsocialtab", - false}, + UseArgs_false}, {"keySocialNextTab", emptyKey, emptyKey, @@ -672,7 +672,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::NOINPUT | InputCondition::INGAME, "nextsocialtab", - false}, + UseArgs_false}, {"keySmilie", addKey(SDLK_LALT), emptyKey, @@ -681,7 +681,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::DEFAULT | InputCondition::INGAME, "", - false}, + UseArgs_false}, {"keyEmoteShortcut1", addKey(SDLK_1), emptyKey, @@ -690,7 +690,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyEmoteShortcut2", addKey(SDLK_2), emptyKey, @@ -699,7 +699,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyEmoteShortcut3", addKey(SDLK_3), emptyKey, @@ -708,7 +708,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyEmoteShortcut4", addKey(SDLK_4), emptyKey, @@ -717,7 +717,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyEmoteShortcut5", addKey(SDLK_5), emptyKey, @@ -726,7 +726,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyEmoteShortcut6", addKey(SDLK_6), emptyKey, @@ -735,7 +735,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyEmoteShortcut7", addKey(SDLK_7), emptyKey, @@ -744,7 +744,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyEmoteShortcut8", addKey(SDLK_8), emptyKey, @@ -753,7 +753,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyEmoteShortcut9", addKey(SDLK_9), emptyKey, @@ -762,7 +762,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyEmoteShortcut10", addKey(SDLK_0), emptyKey, @@ -771,7 +771,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyEmoteShortcut11", addKey(SDLK_MINUS), emptyKey, @@ -780,7 +780,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyEmoteShortcut12", addKey(SDLK_EQUALS), emptyKey, @@ -789,7 +789,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyEmoteShortcut13", addKey(SDLK_BACKSPACE), emptyKey, @@ -798,7 +798,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyEmoteShortcut14", addKey(SDLK_INSERT), emptyKey, @@ -807,7 +807,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyEmoteShortcut15", addKey(SDLK_HOME), emptyKey, @@ -816,7 +816,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyEmoteShortcut16", addKey(SDLK_q), emptyKey, @@ -825,7 +825,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyEmoteShortcut17", addKey(SDLK_w), emptyKey, @@ -834,7 +834,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyEmoteShortcut18", addKey(SDLK_e), emptyKey, @@ -843,7 +843,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyEmoteShortcut19", addKey(SDLK_r), emptyKey, @@ -852,7 +852,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyEmoteShortcut20", addKey(SDLK_t), emptyKey, @@ -861,7 +861,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyEmoteShortcut21", addKey(SDLK_y), emptyKey, @@ -870,7 +870,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyEmoteShortcut22", addKey(SDLK_u), emptyKey, @@ -879,7 +879,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyEmoteShortcut23", addKey(SDLK_i), emptyKey, @@ -888,7 +888,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyEmoteShortcut24", addKey(SDLK_o), emptyKey, @@ -897,7 +897,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyEmoteShortcut25", addKey(SDLK_p), emptyKey, @@ -906,7 +906,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyEmoteShortcut26", addKey(SDLK_LEFTBRACKET), emptyKey, @@ -915,7 +915,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyEmoteShortcut27", addKey(SDLK_RIGHTBRACKET), emptyKey, @@ -924,7 +924,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyEmoteShortcut28", addKey(SDLK_BACKSLASH), emptyKey, @@ -933,7 +933,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyEmoteShortcut29", addKey(SDLK_a), emptyKey, @@ -942,7 +942,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyEmoteShortcut30", addKey(SDLK_s), emptyKey, @@ -951,7 +951,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyEmoteShortcut31", addKey(SDLK_d), emptyKey, @@ -960,7 +960,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyEmoteShortcut32", addKey(SDLK_f), emptyKey, @@ -969,7 +969,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyEmoteShortcut33", addKey(SDLK_g), emptyKey, @@ -978,7 +978,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyEmoteShortcut34", addKey(SDLK_h), emptyKey, @@ -987,7 +987,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyEmoteShortcut35", addKey(SDLK_j), emptyKey, @@ -996,7 +996,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyEmoteShortcut36", addKey(SDLK_k), emptyKey, @@ -1005,7 +1005,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyEmoteShortcut37", addKey(SDLK_l), emptyKey, @@ -1014,7 +1014,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyEmoteShortcut38", addKey(SDLK_SEMICOLON), emptyKey, @@ -1023,7 +1023,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyEmoteShortcut39", addKey(SDLK_QUOTE), emptyKey, @@ -1032,7 +1032,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyEmoteShortcut40", addKey(SDLK_z), emptyKey, @@ -1041,7 +1041,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyEmoteShortcut41", addKey(SDLK_x), emptyKey, @@ -1050,7 +1050,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyEmoteShortcut42", addKey(SDLK_c), emptyKey, @@ -1059,7 +1059,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyEmoteShortcut43", addKey(SDLK_v), emptyKey, @@ -1068,7 +1068,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyEmoteShortcut44", addKey(SDLK_b), emptyKey, @@ -1077,7 +1077,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyEmoteShortcut45", addKey(SDLK_n), emptyKey, @@ -1086,7 +1086,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyEmoteShortcut46", addKey(SDLK_m), emptyKey, @@ -1095,7 +1095,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyEmoteShortcut47", addKey(SDLK_COMMA), emptyKey, @@ -1104,7 +1104,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyEmoteShortcut48", addKey(SDLK_PERIOD), emptyKey, @@ -1113,7 +1113,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyWearOutfit", addKey(SDLK_RCTRL), emptyKey, @@ -1122,7 +1122,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::DEFAULT | InputCondition::INGAME, "", - false}, + UseArgs_false}, {"keyCopyOutfit", addKey(SDLK_RALT), emptyKey, @@ -1131,7 +1131,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::DEFAULT | InputCondition::INGAME, "", - false}, + UseArgs_false}, {"keyCopyEquipedOutfit", addKey(SDLK_RIGHTBRACKET), emptyKey, @@ -1140,7 +1140,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::VALIDSPEED, "", - false}, + UseArgs_false}, {"keyOutfitShortcut1", addKey(SDLK_1), emptyKey, @@ -1149,7 +1149,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyOutfitShortcut2", addKey(SDLK_2), emptyKey, @@ -1158,7 +1158,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyOutfitShortcut3", addKey(SDLK_3), emptyKey, @@ -1167,7 +1167,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyOutfitShortcut4", addKey(SDLK_4), emptyKey, @@ -1176,7 +1176,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyOutfitShortcut5", addKey(SDLK_5), emptyKey, @@ -1185,7 +1185,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyOutfitShortcut6", addKey(SDLK_6), emptyKey, @@ -1194,7 +1194,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyOutfitShortcut7", addKey(SDLK_7), emptyKey, @@ -1203,7 +1203,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyOutfitShortcut8", addKey(SDLK_8), emptyKey, @@ -1212,7 +1212,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyOutfitShortcut9", addKey(SDLK_9), emptyKey, @@ -1221,7 +1221,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyOutfitShortcut10", addKey(SDLK_0), emptyKey, @@ -1230,7 +1230,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyOutfitShortcut11", addKey(SDLK_MINUS), emptyKey, @@ -1239,7 +1239,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyOutfitShortcut12", addKey(SDLK_EQUALS), emptyKey, @@ -1248,7 +1248,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyOutfitShortcut13", addKey(SDLK_BACKSPACE), emptyKey, @@ -1257,7 +1257,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyOutfitShortcut14", addKey(SDLK_INSERT), emptyKey, @@ -1266,7 +1266,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyOutfitShortcut15", addKey(SDLK_HOME), emptyKey, @@ -1275,7 +1275,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyOutfitShortcut16", addKey(SDLK_q), emptyKey, @@ -1284,7 +1284,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyOutfitShortcut17", addKey(SDLK_w), emptyKey, @@ -1293,7 +1293,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyOutfitShortcut18", addKey(SDLK_e), emptyKey, @@ -1302,7 +1302,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyOutfitShortcut19", addKey(SDLK_r), emptyKey, @@ -1311,7 +1311,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyOutfitShortcut20", addKey(SDLK_t), emptyKey, @@ -1320,7 +1320,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyOutfitShortcut21", addKey(SDLK_y), emptyKey, @@ -1329,7 +1329,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyOutfitShortcut22", addKey(SDLK_u), emptyKey, @@ -1338,7 +1338,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyOutfitShortcut23", addKey(SDLK_i), emptyKey, @@ -1347,7 +1347,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyOutfitShortcut24", addKey(SDLK_o), emptyKey, @@ -1356,7 +1356,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyOutfitShortcut25", addKey(SDLK_p), emptyKey, @@ -1365,7 +1365,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyOutfitShortcut26", addKey(SDLK_LEFTBRACKET), emptyKey, @@ -1374,7 +1374,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyOutfitShortcut27", addKey(SDLK_RIGHTBRACKET), emptyKey, @@ -1383,7 +1383,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyOutfitShortcut28", addKey(SDLK_BACKSLASH), emptyKey, @@ -1392,7 +1392,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyOutfitShortcut29", addKey(SDLK_a), emptyKey, @@ -1401,7 +1401,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyOutfitShortcut30", addKey(SDLK_s), emptyKey, @@ -1410,7 +1410,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyOutfitShortcut31", addKey(SDLK_d), emptyKey, @@ -1419,7 +1419,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyOutfitShortcut32", addKey(SDLK_f), emptyKey, @@ -1428,7 +1428,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyOutfitShortcut33", addKey(SDLK_g), emptyKey, @@ -1437,7 +1437,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyOutfitShortcut34", addKey(SDLK_h), emptyKey, @@ -1446,7 +1446,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyOutfitShortcut35", addKey(SDLK_j), emptyKey, @@ -1455,7 +1455,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyOutfitShortcut36", addKey(SDLK_k), emptyKey, @@ -1464,7 +1464,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyOutfitShortcut37", addKey(SDLK_l), emptyKey, @@ -1473,7 +1473,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyOutfitShortcut38", addKey(SDLK_SEMICOLON), emptyKey, @@ -1482,7 +1482,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyOutfitShortcut39", addKey(SDLK_QUOTE), emptyKey, @@ -1491,7 +1491,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyOutfitShortcut40", addKey(SDLK_z), emptyKey, @@ -1500,7 +1500,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyOutfitShortcut41", addKey(SDLK_x), emptyKey, @@ -1509,7 +1509,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyOutfitShortcut42", addKey(SDLK_c), emptyKey, @@ -1518,7 +1518,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyOutfitShortcut43", addKey(SDLK_v), emptyKey, @@ -1527,7 +1527,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyOutfitShortcut44", addKey(SDLK_b), emptyKey, @@ -1536,7 +1536,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyOutfitShortcut45", addKey(SDLK_n), emptyKey, @@ -1545,7 +1545,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyOutfitShortcut46", addKey(SDLK_m), emptyKey, @@ -1554,7 +1554,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyOutfitShortcut47", addKey(SDLK_COMMA), emptyKey, @@ -1563,7 +1563,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyOutfitShortcut48", addKey(SDLK_PERIOD), emptyKey, @@ -1572,7 +1572,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyMoveToPointShortcut1", addKey(SDLK_1), emptyKey, @@ -1581,7 +1581,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::MOVE_TO_POINT, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyMoveToPointShortcut2", addKey(SDLK_2), emptyKey, @@ -1590,7 +1590,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::MOVE_TO_POINT, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyMoveToPointShortcut3", addKey(SDLK_3), emptyKey, @@ -1599,7 +1599,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::MOVE_TO_POINT, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyMoveToPointShortcut4", addKey(SDLK_4), emptyKey, @@ -1608,7 +1608,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::MOVE_TO_POINT, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyMoveToPointShortcut5", addKey(SDLK_5), emptyKey, @@ -1617,7 +1617,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::MOVE_TO_POINT, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyMoveToPointShortcut6", addKey(SDLK_6), emptyKey, @@ -1626,7 +1626,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::MOVE_TO_POINT, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyMoveToPointShortcut7", addKey(SDLK_7), emptyKey, @@ -1635,7 +1635,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::MOVE_TO_POINT, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyMoveToPointShortcut8", addKey(SDLK_8), emptyKey, @@ -1644,7 +1644,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::MOVE_TO_POINT, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyMoveToPointShortcut9", addKey(SDLK_9), emptyKey, @@ -1653,7 +1653,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::MOVE_TO_POINT, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyMoveToPointShortcut10", addKey(SDLK_0), emptyKey, @@ -1662,7 +1662,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::MOVE_TO_POINT, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyMoveToPointShortcut11", addKey(SDLK_MINUS), emptyKey, @@ -1671,7 +1671,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::MOVE_TO_POINT, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyMoveToPointShortcut12", addKey(SDLK_EQUALS), emptyKey, @@ -1680,7 +1680,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::MOVE_TO_POINT, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyMoveToPointShortcut13", addKey(SDLK_BACKSPACE), emptyKey, @@ -1689,7 +1689,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::MOVE_TO_POINT, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyMoveToPointShortcut14", addKey(SDLK_INSERT), emptyKey, @@ -1698,7 +1698,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::MOVE_TO_POINT, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyMoveToPointShortcut15", addKey(SDLK_HOME), emptyKey, @@ -1707,7 +1707,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::MOVE_TO_POINT, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyMoveToPointShortcut16", addKey(SDLK_q), emptyKey, @@ -1716,7 +1716,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::MOVE_TO_POINT, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyMoveToPointShortcut17", addKey(SDLK_w), emptyKey, @@ -1725,7 +1725,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::MOVE_TO_POINT, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyMoveToPointShortcut18", addKey(SDLK_e), emptyKey, @@ -1734,7 +1734,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::MOVE_TO_POINT, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyMoveToPointShortcut19", addKey(SDLK_r), emptyKey, @@ -1743,7 +1743,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::MOVE_TO_POINT, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyMoveToPointShortcut20", addKey(SDLK_t), emptyKey, @@ -1752,7 +1752,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::MOVE_TO_POINT, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyMoveToPointShortcut21", addKey(SDLK_y), emptyKey, @@ -1761,7 +1761,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::MOVE_TO_POINT, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyMoveToPointShortcut22", addKey(SDLK_u), emptyKey, @@ -1770,7 +1770,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::MOVE_TO_POINT, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyMoveToPointShortcut23", addKey(SDLK_i), emptyKey, @@ -1779,7 +1779,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::MOVE_TO_POINT, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyMoveToPointShortcut24", addKey(SDLK_o), emptyKey, @@ -1788,7 +1788,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::MOVE_TO_POINT, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyMoveToPointShortcut25", addKey(SDLK_p), emptyKey, @@ -1797,7 +1797,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::MOVE_TO_POINT, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyMoveToPointShortcut26", addKey(SDLK_LEFTBRACKET), emptyKey, @@ -1806,7 +1806,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::MOVE_TO_POINT, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyMoveToPointShortcut27", addKey(SDLK_RIGHTBRACKET), emptyKey, @@ -1815,7 +1815,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::MOVE_TO_POINT, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyMoveToPointShortcut28", addKey(SDLK_BACKSLASH), emptyKey, @@ -1824,7 +1824,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::MOVE_TO_POINT, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyMoveToPointShortcut29", addKey(SDLK_a), emptyKey, @@ -1833,7 +1833,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::MOVE_TO_POINT, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyMoveToPointShortcut30", addKey(SDLK_s), emptyKey, @@ -1842,7 +1842,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::MOVE_TO_POINT, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyMoveToPointShortcut31", addKey(SDLK_d), emptyKey, @@ -1851,7 +1851,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::MOVE_TO_POINT, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyMoveToPointShortcut32", addKey(SDLK_f), emptyKey, @@ -1860,7 +1860,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::MOVE_TO_POINT, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyMoveToPointShortcut33", addKey(SDLK_g), emptyKey, @@ -1869,7 +1869,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::MOVE_TO_POINT, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyMoveToPointShortcut34", addKey(SDLK_h), emptyKey, @@ -1878,7 +1878,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::MOVE_TO_POINT, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyMoveToPointShortcut35", addKey(SDLK_j), emptyKey, @@ -1887,7 +1887,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::MOVE_TO_POINT, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyMoveToPointShortcut36", addKey(SDLK_k), emptyKey, @@ -1896,7 +1896,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::MOVE_TO_POINT, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyMoveToPointShortcut37", addKey(SDLK_l), emptyKey, @@ -1905,7 +1905,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::MOVE_TO_POINT, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyMoveToPointShortcut38", addKey(SDLK_SEMICOLON), emptyKey, @@ -1914,7 +1914,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::MOVE_TO_POINT, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyMoveToPointShortcut39", addKey(SDLK_QUOTE), emptyKey, @@ -1923,7 +1923,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::MOVE_TO_POINT, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyMoveToPointShortcut40", addKey(SDLK_z), emptyKey, @@ -1932,7 +1932,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::MOVE_TO_POINT, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyMoveToPointShortcut41", addKey(SDLK_x), emptyKey, @@ -1941,7 +1941,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::MOVE_TO_POINT, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyMoveToPointShortcut42", addKey(SDLK_c), emptyKey, @@ -1950,7 +1950,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::MOVE_TO_POINT, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyMoveToPointShortcut43", addKey(SDLK_v), emptyKey, @@ -1959,7 +1959,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::MOVE_TO_POINT, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyMoveToPointShortcut44", addKey(SDLK_b), emptyKey, @@ -1968,7 +1968,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::MOVE_TO_POINT, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyMoveToPointShortcut45", addKey(SDLK_n), emptyKey, @@ -1977,7 +1977,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::MOVE_TO_POINT, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyMoveToPointShortcut46", addKey(SDLK_m), emptyKey, @@ -1986,7 +1986,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::MOVE_TO_POINT, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyMoveToPointShortcut47", addKey(SDLK_COMMA), emptyKey, @@ -1995,7 +1995,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::MOVE_TO_POINT, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyMoveToPointShortcut48", addKey(SDLK_PERIOD), emptyKey, @@ -2004,7 +2004,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::MOVE_TO_POINT, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyChat", addKey(SDLK_RETURN), emptyKey, @@ -2014,7 +2014,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputCondition::NOINPUT | InputCondition::NOAWAY | InputCondition::NOMODAL | InputCondition::INGAME, "chat", - false}, + UseArgs_false}, {"keyChatScrollUp", addKey(SDLK_PAGEUP), emptyKey, @@ -2023,7 +2023,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::DEFAULT | InputCondition::INGAME, "chatscrollup", - false}, + UseArgs_false}, {"keyChatScrollDown", addKey(SDLK_PAGEDOWN), emptyKey, @@ -2032,7 +2032,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::DEFAULT | InputCondition::INGAME, "chatscrolldown", - false}, + UseArgs_false}, {"keyChatPrevTab", addKey(SDLK_KP7), emptyKey, @@ -2041,7 +2041,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::NOINPUT | InputCondition::INGAME, "prevtab", - false}, + UseArgs_false}, {"keyChatNextTab", addKey(SDLK_KP9), emptyKey, @@ -2050,7 +2050,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::NOINPUT | InputCondition::INGAME, "nexttab", - false}, + UseArgs_false}, {"keyChatCloseTab", emptyKey, emptyKey, @@ -2059,7 +2059,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::NOINPUT | InputCondition::INGAME, "close", - false}, + UseArgs_false}, {"keyChatPrevHistory", addKey(SDLK_KP7), emptyKey, @@ -2068,7 +2068,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::DEFAULT | InputCondition::INGAME, "", - false}, + UseArgs_false}, {"keyChatNextHistory", addKey(SDLK_KP9), emptyKey, @@ -2077,7 +2077,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::DEFAULT | InputCondition::INGAME, "", - false}, + UseArgs_false}, {"keyIgnoreInput1", #ifdef USE_SDL2 emptyKey, @@ -2090,7 +2090,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 500, InputCondition::DEFAULT, "", - false}, + UseArgs_false}, {"keyIgnoreInput2", #ifdef USE_SDL2 emptyKey, @@ -2103,27 +2103,27 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 500, InputCondition::DEFAULT, "", - false}, + UseArgs_false}, {"keyDirectUp", defaultAction(&Actions::directUp), InputCondition::GAME, "directup|turnup", - false}, + UseArgs_false}, {"keyDirectDown", defaultAction(&Actions::directDown), InputCondition::GAME, "directdown|turndown", - false}, + UseArgs_false}, {"keyDirectLeft", defaultAction(&Actions::directLeft), InputCondition::GAME, "directleft|turnleft", - false}, + UseArgs_false}, {"keyDirectRight", defaultAction(&Actions::directRight), InputCondition::GAME, "directright|turnright", - false}, + UseArgs_false}, {"keyCrazyMoves", addKey(SDLK_SLASH), emptyKey, @@ -2132,7 +2132,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::VALIDSPEED, "", - false}, + UseArgs_false}, {"keyChangeCrazyMoveType", addKey(SDLK_BACKSLASH), emptyKey, @@ -2142,7 +2142,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputCondition::GAME | InputCondition::VALIDSPEED | InputCondition::EMODS, "", - false}, + UseArgs_false}, {"keyQuickDrop", addKey(SDLK_y), emptyKey, @@ -2151,7 +2151,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::VALIDSPEED, "drop", - false}, + UseArgs_false}, {"keyQuickDropN", addKey(SDLK_u), emptyKey, @@ -2160,7 +2160,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::VALIDSPEED, "dropn", - false}, + UseArgs_false}, {"keySwitchQuickDrop", addKey(SDLK_i), emptyKey, @@ -2169,7 +2169,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::VALIDSPEED, "", - false}, + UseArgs_false}, {"keyMagicInma1", addKey(SDLK_c), emptyKey, @@ -2178,7 +2178,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::VALIDSPEED, "heal", - true}, + UseArgs_true}, {"keyMagicItenplz", addKey(SDLK_m), emptyKey, @@ -2187,7 +2187,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::VALIDSPEED, "itenplz", - false}, + UseArgs_false}, {"keyMagicAttack", addKey(SDLK_b), emptyKey, @@ -2196,7 +2196,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::VALIDSPEED, "magicattack", - false}, + UseArgs_false}, {"keySwitchMagicAttack", addKey(SDLK_COMMA), emptyKey, @@ -2206,19 +2206,19 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputCondition::GAME | InputCondition::VALIDSPEED | InputCondition::EMODS, "", - false}, + UseArgs_false}, {"keySwitchPvpAttack", defaultAction(&Actions::changePvpMode), InputCondition::GAME | InputCondition::VALIDSPEED | InputCondition::EMODS, "", - false}, + UseArgs_false}, {"keyInvertDirection", defaultAction(&Actions::changeMoveType), InputCondition::GAME | InputCondition::VALIDSPEED | InputCondition::EMODS, "", - false}, + UseArgs_false}, {"keyChangeAttackWeaponType", addKey(SDLK_g), emptyKey, @@ -2228,7 +2228,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputCondition::GAME | InputCondition::VALIDSPEED | InputCondition::EMODS, "", - false}, + UseArgs_false}, {"keyChangeAttackType", addKey(SDLK_END), emptyKey, @@ -2238,7 +2238,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputCondition::GAME | InputCondition::VALIDSPEED | InputCondition::EMODS, "", - false}, + UseArgs_false}, {"keyChangeFollowMode", addKey(SDLK_KP1), emptyKey, @@ -2248,7 +2248,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputCondition::GAME | InputCondition::VALIDSPEED | InputCondition::EMODS, "", - false}, + UseArgs_false}, {"keyChangeImitationMode", addKey(SDLK_KP4), emptyKey, @@ -2258,7 +2258,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputCondition::GAME | InputCondition::VALIDSPEED | InputCondition::EMODS, "", - false}, + UseArgs_false}, {"keyDisableGameModifiers", addKey(SDLK_KP8), emptyKey, @@ -2267,7 +2267,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::VALIDSPEED, "", - false}, + UseArgs_false}, {"keyChangeAudio", addKey(SDLK_KP3), emptyKey, @@ -2276,7 +2276,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::VALIDSPEED, "audio", - false}, + UseArgs_false}, {"keyAway", addKey(SDLK_KP2), emptyKey, @@ -2285,7 +2285,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::VALIDSPEED, "", - false}, + UseArgs_false}, {"keyRightClick", addKey(SDLK_TAB), emptyKey, @@ -2295,7 +2295,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputCondition::NOINPUT | InputCondition::NOAWAY | InputCondition::NOMODAL | InputCondition::INGAME, "rightclick", - false}, + UseArgs_false}, {"keyCameraMode", addKey(SDLK_KP_PLUS), emptyKey, @@ -2305,7 +2305,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputCondition::GAME | InputCondition::VALIDSPEED | InputCondition::EMODS, "", - false}, + UseArgs_false}, {"keyMod", emptyKey, emptyKey, @@ -2314,7 +2314,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::DEFAULT, "", - false}, + UseArgs_false}, {"keyGUIUp", addKey(SDLK_UP), emptyKey, @@ -2323,7 +2323,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::DEFAULT, "", - false}, + UseArgs_false}, {"keyGUIDown", addKey(SDLK_DOWN), emptyKey, @@ -2332,7 +2332,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::DEFAULT, "", - false}, + UseArgs_false}, {"keyGUILeft", addKey(SDLK_LEFT), emptyKey, @@ -2341,7 +2341,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::DEFAULT, "", - false}, + UseArgs_false}, {"keyGUIRight", addKey(SDLK_RIGHT), emptyKey, @@ -2350,7 +2350,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::DEFAULT, "", - false}, + UseArgs_false}, {"keyGUISelect", addKey(SDLK_SPACE), emptyKey, @@ -2359,7 +2359,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::DEFAULT, "", - false}, + UseArgs_false}, {"keyGUISelect2", addKey(SDLK_RETURN), emptyKey, @@ -2368,7 +2368,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::DEFAULT, "", - false}, + UseArgs_false}, {"keyGUICancel", addKey(SDLK_ESCAPE), #if defined(USE_SDL2) && defined(ANDROID) @@ -2381,7 +2381,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::DEFAULT, "", - false}, + UseArgs_false}, {"keyGUIHome", addKey(SDLK_HOME), emptyKey, @@ -2390,7 +2390,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::DEFAULT, "", - false}, + UseArgs_false}, {"keyGUIEnd", addKey(SDLK_END), emptyKey, @@ -2399,7 +2399,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::DEFAULT, "", - false}, + UseArgs_false}, {"keyGUIDelete", addKey(SDLK_DELETE), emptyKey, @@ -2408,7 +2408,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::DEFAULT, "", - false}, + UseArgs_false}, {"keyGUIBackSpace", addKey(SDLK_BACKSPACE), emptyKey, @@ -2417,7 +2417,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::DEFAULT, "", - false}, + UseArgs_false}, {"keyGUITab", addKey(SDLK_TAB), emptyKey, @@ -2426,7 +2426,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::DEFAULT, "", - false}, + UseArgs_false}, {"keyGUIPageUp", addKey(SDLK_PAGEUP), emptyKey, @@ -2435,7 +2435,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::DEFAULT, "", - false}, + UseArgs_false}, {"keyGUIPageDown", addKey(SDLK_PAGEDOWN), emptyKey, @@ -2444,7 +2444,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::DEFAULT, "", - false}, + UseArgs_false}, {"keyGUIInsert", addKey(SDLK_INSERT), emptyKey, @@ -2453,7 +2453,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::DEFAULT, "", - false}, + UseArgs_false}, {"keyGUIMod", addKey(SDLK_LSHIFT), addKey(SDLK_RSHIFT), @@ -2462,7 +2462,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::DEFAULT, "", - false}, + UseArgs_false}, {"keySafeVideo", addKey(SDLK_KP_MINUS), emptyKey, @@ -2471,22 +2471,22 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::DEFAULT, "", - false}, + UseArgs_false}, {"keyStopSit", defaultAction(&Actions::stopSit), InputCondition::DEFAULT | InputCondition::INGAME, "sit2", - false}, + UseArgs_false}, {"keyShowKeyboard", defaultAction(&Actions::showKeyboard), InputCondition::DEFAULT, "showkeyboard", - false}, + UseArgs_false}, {"keyShowWindows", defaultAction(&Actions::showWindows), InputCondition::DEFAULT, "showwindows", - false}, + UseArgs_false}, {"keyChatMod", addKey(SDLK_LSHIFT), emptyKey, @@ -2495,12 +2495,12 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::DEFAULT | InputCondition::INGAME, "", - false}, + UseArgs_false}, {"keyMoveForward", defaultAction(&Actions::moveForward), InputCondition::ARROWKEYS, "", - false}, + UseArgs_false}, {"keyGUICtrl", addKey(SDLK_LCTRL), addKey(SDLK_RCTRL), @@ -2509,7 +2509,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::DEFAULT, "", - false}, + UseArgs_false}, {"keyGUIb", addKey(SDLK_b), emptyKey, @@ -2518,7 +2518,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::DEFAULT, "", - false}, + UseArgs_false}, {"keyGUIc", addKey(SDLK_c), emptyKey, @@ -2527,7 +2527,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::DEFAULT, "", - false}, + UseArgs_false}, {"keyGUId", addKey(SDLK_d), emptyKey, @@ -2536,7 +2536,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::DEFAULT, "", - false}, + UseArgs_false}, {"keyGUIe", addKey(SDLK_e), emptyKey, @@ -2545,7 +2545,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::DEFAULT, "", - false}, + UseArgs_false}, {"keyGUIf", addKey(SDLK_f), emptyKey, @@ -2554,7 +2554,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::DEFAULT, "", - false}, + UseArgs_false}, {"keyGUIh", addKey(SDLK_h), emptyKey, @@ -2563,7 +2563,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::DEFAULT, "", - false}, + UseArgs_false}, {"keyGUIk", addKey(SDLK_k), emptyKey, @@ -2572,7 +2572,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::DEFAULT, "", - false}, + UseArgs_false}, {"keyGUIu", addKey(SDLK_u), emptyKey, @@ -2581,7 +2581,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::DEFAULT, "", - false}, + UseArgs_false}, {"keyGUIv", addKey(SDLK_v), emptyKey, @@ -2590,7 +2590,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::DEFAULT, "", - false}, + UseArgs_false}, {"keyGUIw", addKey(SDLK_w), emptyKey, @@ -2599,7 +2599,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::DEFAULT, "", - false}, + UseArgs_false}, {"keyShortcutsPrevTab", emptyKey, emptyKey, @@ -2608,7 +2608,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::NOINPUT | InputCondition::INGAME, "shortcutprevtab", - false}, + UseArgs_false}, {"keyShortcutsNextTab", emptyKey, emptyKey, @@ -2617,7 +2617,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::NOINPUT | InputCondition::INGAME, "shortcutnexttab", - false}, + UseArgs_false}, {"keyCommandsPrevTab", emptyKey, emptyKey, @@ -2626,7 +2626,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::NOINPUT | InputCondition::INGAME, "commandsprevtab", - false}, + UseArgs_false}, {"keyCommandsNextTab", emptyKey, emptyKey, @@ -2635,12 +2635,12 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::NOINPUT | InputCondition::INGAME, "commandsnexttab", - false}, + UseArgs_false}, {"keyOpenTrade", defaultAction(&Actions::openTrade), InputCondition::GAME | InputCondition::NOTARGET, "trade", - false}, + UseArgs_false}, {"keyGUIF1", addKey(SDLK_F1), emptyKey, @@ -2649,7 +2649,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::DEFAULT, "", - false}, + UseArgs_false}, {"keyGUIF2", addKey(SDLK_F2), emptyKey, @@ -2658,7 +2658,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::DEFAULT, "", - false}, + UseArgs_false}, {"keyGUIF3", addKey(SDLK_F3), emptyKey, @@ -2667,7 +2667,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::DEFAULT, "", - false}, + UseArgs_false}, {"keyGUIF4", addKey(SDLK_F4), emptyKey, @@ -2676,7 +2676,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::DEFAULT, "", - false}, + UseArgs_false}, {"keyGUIF5", addKey(SDLK_F5), emptyKey, @@ -2685,7 +2685,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::DEFAULT, "", - false}, + UseArgs_false}, {"keyGUIF6", addKey(SDLK_F6), emptyKey, @@ -2694,7 +2694,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::DEFAULT, "", - false}, + UseArgs_false}, {"keyGUIF7", addKey(SDLK_F7), emptyKey, @@ -2703,7 +2703,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::DEFAULT, "", - false}, + UseArgs_false}, {"keyGUIF8", addKey(SDLK_F8), emptyKey, @@ -2712,7 +2712,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::DEFAULT, "", - false}, + UseArgs_false}, {"keyGUIF9", addKey(SDLK_F9), emptyKey, @@ -2721,7 +2721,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::DEFAULT, "", - false}, + UseArgs_false}, {"keyGUIF10", addKey(SDLK_F10), emptyKey, @@ -2730,7 +2730,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::DEFAULT, "", - false}, + UseArgs_false}, {"keyGUIF11", addKey(SDLK_F11), emptyKey, @@ -2739,7 +2739,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::DEFAULT, "", - false}, + UseArgs_false}, {"keyGUIF12", addKey(SDLK_F12), emptyKey, @@ -2748,7 +2748,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::DEFAULT, "", - false}, + UseArgs_false}, {"keyWindowAbout", emptyKey, emptyKey, @@ -2757,7 +2757,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::SHORTCUT0, "about", - false}, + UseArgs_false}, {"keyWindowUpdater", emptyKey, emptyKey, @@ -2766,7 +2766,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::GAME, "updater", - false}, + UseArgs_false}, {"keyTargetClosestMonster", emptyKey, emptyKey, @@ -2776,7 +2776,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputCondition::GAME | InputCondition::NOTARGET | InputCondition::VALIDSPEED, "targetclosestmonster", - false}, + UseArgs_false}, {"keyChatCloseAllTabs", emptyKey, emptyKey, @@ -2785,7 +2785,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::INGAME, "closeall", - false}, + UseArgs_false}, {"keyChatIgnoreAllWhispers", emptyKey, emptyKey, @@ -2794,7 +2794,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::INGAME, "ignoreallwhispers", - false}, + UseArgs_false}, {"keyChatAnnounce", emptyKey, emptyKey, @@ -2803,322 +2803,322 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::INGAME, "announce", - true}, + UseArgs_true}, {"keyIpcToggle", defaultAction(&Actions::ipcToggle), InputCondition::INGAME, "ipctoggle", - false}, + UseArgs_false}, {"keyWhere", defaultAction(&Actions::where), InputCondition::INGAME, "where", - false}, + UseArgs_false}, {"keyWho", defaultAction(&Actions::who), InputCondition::INGAME, "who", - false}, + UseArgs_false}, {"keyWhisper", defaultAction(&Actions::msg), InputCondition::INGAME, "w|whisper|msg", - true}, + UseArgs_true}, {"keyQuery", defaultAction(&Actions::query), InputCondition::INGAME, "q|query|j|join", - true}, + UseArgs_true}, {"keyClearChatTab", defaultAction(&Actions::clearChatTab), InputCondition::INGAME, "clear", - false}, + UseArgs_false}, {"keyIgnore", defaultAction(&Actions::chatIgnore), InputCondition::INGAME, "ignore", - true}, + UseArgs_true}, {"keyUnignore", defaultAction(&Actions::chatUnignore), InputCondition::INGAME, "unignore", - true}, + UseArgs_true}, {"keyFriend", defaultAction(&Actions::chatFriend), InputCondition::INGAME, "friend|befriend", - true}, + UseArgs_true}, {"keyDisregard", defaultAction(&Actions::chatDisregard), InputCondition::INGAME, "disregard", - true}, + UseArgs_true}, {"keyNeutral", defaultAction(&Actions::chatNeutral), InputCondition::INGAME, "neutral", - true}, + UseArgs_true}, {"keyBlacklist", defaultAction(&Actions::chatBlackList), InputCondition::INGAME, "blacklist", - true}, + UseArgs_true}, {"keyEnemy", defaultAction(&Actions::chatEnemy), InputCondition::INGAME, "enemy", - true}, + UseArgs_true}, {"keyErase", defaultAction(&Actions::chatErase), InputCondition::INGAME, "erase", - true}, + UseArgs_true}, {"keyCleanGraphics", defaultAction(&Actions::cleanGraphics), InputCondition::INGAME, "cleangraphics", - false}, + UseArgs_false}, {"keyCleanFonts", defaultAction(&Actions::cleanFonts), InputCondition::INGAME, "cleanfonts", - false}, + UseArgs_false}, {"keyCreateParty", defaultAction(&Actions::createParty), InputCondition::INGAME, "createparty", - true}, + UseArgs_true}, {"keyCreateGuild", defaultAction(&Actions::createGuild), InputCondition::INGAME, "createguild", - true}, + UseArgs_true}, {"keyParty", defaultAction(&Actions::party), InputCondition::INGAME, "party", - true}, + UseArgs_true}, {"keyMe", defaultAction(&Actions::me), InputCondition::INGAME, "me", - true}, + UseArgs_true}, {"keyToggle", defaultAction(&Actions::toggle), InputCondition::INGAME, "toggle", - false}, + UseArgs_false}, {"keyPresent", defaultAction(&Actions::present), InputCondition::INGAME, "present", - false}, + UseArgs_false}, {"keyPrintAll", defaultAction(&Actions::printAll), InputCondition::INGAME, "all", - false}, + UseArgs_false}, {"keyMove", defaultAction(&Actions::move), InputCondition::INGAME, "move", - true}, + UseArgs_true}, {"keySetTarget", defaultAction(&Actions::setTarget), InputCondition::INGAME, "target", - true}, + UseArgs_true}, {"keyAttackHuman", defaultAction(&Actions::attackHuman), InputCondition::INGAME, "atkhuman", - false}, + UseArgs_false}, {"keyOutfit", defaultAction(&Actions::commandOutfit), InputCondition::INGAME, "outfit", - true}, + UseArgs_true}, {"keyEmote", defaultAction(&Actions::commandEmote), InputCondition::INGAME, "emote", - true}, + UseArgs_true}, {"keyEmotePet", defaultAction(&Actions::commandEmotePet), InputCondition::INGAME, "emotepet", - true}, + UseArgs_true}, {"keyAwayMessage", defaultAction(&Actions::awayMessage), InputCondition::INGAME, "away", - true}, + UseArgs_true}, {"keyPseudoAway", defaultAction(&Actions::pseudoAway), InputCondition::INGAME, "pseudoaway", - true}, + UseArgs_true}, {"keyFollow", defaultAction(&Actions::follow), InputCondition::INGAME, "follow", - true}, + UseArgs_true}, {"keyNavigate", defaultAction(&Actions::navigate), InputCondition::INGAME, "navigate", - true}, + UseArgs_true}, {"keyImitation", defaultAction(&Actions::imitation), InputCondition::INGAME, "imitation", - true}, + UseArgs_true}, {"keySendMail", defaultAction(&Actions::sendMail), InputCondition::INGAME, "mail", - true}, + UseArgs_true}, {"keyTradeCommand", defaultAction(&Actions::trade), InputCondition::INGAME, "trade", - true}, + UseArgs_true}, {"keyPriceLoad", defaultAction(&Actions::priceLoad), InputCondition::INGAME, "priceload", - false}, + UseArgs_false}, {"keyPriceSave", defaultAction(&Actions::priceSave), InputCondition::INGAME, "pricesave", - false}, + UseArgs_false}, {"keyCacheInfo", defaultAction(&Actions::cacheInfo), InputCondition::INGAME, "cacheinfo", - false}, + UseArgs_false}, {"keyDisconnect", defaultAction(&Actions::disconnect), InputCondition::INGAME, "disconnect", - false}, + UseArgs_false}, {"keyUndress", defaultAction(&Actions::undress), InputCondition::INGAME, "undress", - true}, + UseArgs_true}, {"keyDirs", defaultAction(&Actions::dirs), InputCondition::INGAME, "dirs", - false}, + UseArgs_false}, {"keyInfo", defaultAction(&Actions::info), InputCondition::INGAME, "info", - false}, + UseArgs_false}, {"keyWait", defaultAction(&Actions::wait), InputCondition::INGAME, "wait", - true}, + UseArgs_true}, {"keyUptime", defaultAction(&Actions::uptime), InputCondition::INGAME, "uptime", - false}, + UseArgs_false}, {"keyAddPriorityAttack", defaultAction(&Actions::addPriorityAttack), InputCondition::INGAME, "addpriorityattack", - true}, + UseArgs_true}, {"keyAddAttack", defaultAction(&Actions::addAttack), InputCondition::INGAME, "addattack", - true}, + UseArgs_true}, {"keyRemoveAttack", defaultAction(&Actions::removeAttack), InputCondition::INGAME, "removeattack|removeignoreattack", - true}, + UseArgs_true}, {"keyAddIgnoreAttack", defaultAction(&Actions::addIgnoreAttack), InputCondition::INGAME, "addignoreattack", - true}, + UseArgs_true}, {"keyDump", defaultAction(&Actions::dump), InputCondition::INGAME, "dump", - false}, + UseArgs_false}, {"keyServerIgnoreAll", defaultAction(&Actions::serverIgnoreAll), InputCondition::INGAME, "serverignoreall", - false}, + UseArgs_false}, {"keyServerUnIgnoreAll", defaultAction(&Actions::serverUnIgnoreAll), InputCondition::INGAME, "serverunignoreall", - false}, + UseArgs_false}, {"keySetDrop", defaultAction(&Actions::setDrop), InputCondition::INGAME, "setdrop", - true}, + UseArgs_true}, {"keyError", defaultAction(&Actions::error), InputCondition::INGAME, "error", - false}, + UseArgs_false}, {"keyDumpg", defaultAction(&Actions::dumpGraphics), InputCondition::INGAME, "dumpg", - false}, + UseArgs_false}, {"keyDumpe", defaultAction(&Actions::dumpEnvironment), InputCondition::INGAME, "dumpe", - false}, + UseArgs_false}, {"keyDumpt", defaultAction(&Actions::dumpTests), InputCondition::INGAME, "dumpt", - false}, + UseArgs_false}, {"keyDumpOGL", defaultAction(&Actions::dumpOGL), InputCondition::INGAME, "dumpogl", - false}, + UseArgs_false}, {"keyDumpGL", defaultAction(&Actions::dumpGL), InputCondition::INGAME, "dumpgl", - false}, + UseArgs_false}, {"keyDumpMods", defaultAction(&Actions::dumpMods), InputCondition::INGAME, "dumpMods", - false}, + UseArgs_false}, {"keyUrl", defaultAction(&Actions::url), InputCondition::INGAME, "url", - true}, + UseArgs_true}, {"keyOpenUrl", defaultAction(&Actions::openUrl), InputCondition::INGAME, "open", - true}, + UseArgs_true}, {"keyExecute", defaultAction(&Actions::execute), InputCondition::INGAME, "execute", - true}, + UseArgs_true}, {"keyTestSdlFont", emptyKey, emptyKey, @@ -3135,92 +3135,92 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { #else "", #endif - false}, + UseArgs_false}, {"keyEnableHightlight", defaultAction(&Actions::enableHighlight), InputCondition::INGAME, "enablehighlight", - false}, + UseArgs_false}, {"keyDisableHightlight", defaultAction(&Actions::disableHighlight), InputCondition::INGAME, "disablehighlight", - false}, + UseArgs_false}, {"keyDontRemoveName", defaultAction(&Actions::dontRemoveName), InputCondition::INGAME, "dontremovename", - false}, + UseArgs_false}, {"keyRemoveName", defaultAction(&Actions::removeName), InputCondition::INGAME, "removename", - false}, + UseArgs_false}, {"keyDisableAway", defaultAction(&Actions::disableAway), InputCondition::INGAME, "disableaway", - false}, + UseArgs_false}, {"keyEnableAway", defaultAction(&Actions::enableAway), InputCondition::INGAME, "enableaway", - false}, + UseArgs_false}, {"keyTestParticle", defaultAction(&Actions::testParticle), InputCondition::INGAME, "testparticle", - true}, + UseArgs_true}, {"keyCreateItems", defaultAction(&Actions::createItems), InputCondition::INGAME, "createitems", - false}, + UseArgs_false}, {"keyTalkRaw", defaultAction(&Actions::talkRaw), InputCondition::INGAME, "talkraw", - true}, + UseArgs_true}, {"keyTalkPet", defaultAction(&Actions::talkPet), InputCondition::INGAME, "talkpet", - true}, + UseArgs_true}, {"keyUploadConfig", defaultAction(&Actions::uploadConfig), InputCondition::INGAME, "uploadconfig", - false}, + UseArgs_false}, {"keyUploadServerConfig", defaultAction(&Actions::uploadServerConfig), InputCondition::INGAME, "uploadserverconfig", - false}, + UseArgs_false}, {"keyUploadLog", defaultAction(&Actions::uploadLog), InputCondition::INGAME, "uploadlog", - false}, + UseArgs_false}, {"keyGm", defaultAction(&Actions::gm), InputCondition::INGAME, "gm", - true}, + UseArgs_true}, {"keyHack", defaultAction(&Actions::hack), InputCondition::INGAME, "hack", - true}, + UseArgs_true}, {"keyDebugSpawn", defaultAction(&Actions::debugSpawn), InputCondition::INGAME, "debugspawn", - true}, + UseArgs_true}, {"keyPetSmilie", defaultAction(nullptr), InputCondition::DEFAULT | InputCondition::INGAME, "", - false}, + UseArgs_false}, {"keyPetEmoteShortcut1", addKey(SDLK_1), emptyKey, @@ -3229,7 +3229,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::PET_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyPetEmoteShortcut2", addKey(SDLK_2), emptyKey, @@ -3238,7 +3238,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::PET_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyPetEmoteShortcut3", addKey(SDLK_3), emptyKey, @@ -3247,7 +3247,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::PET_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyPetEmoteShortcut4", addKey(SDLK_4), emptyKey, @@ -3256,7 +3256,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::PET_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyPetEmoteShortcut5", addKey(SDLK_5), emptyKey, @@ -3265,7 +3265,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::PET_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyPetEmoteShortcut6", addKey(SDLK_6), emptyKey, @@ -3274,7 +3274,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::PET_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyPetEmoteShortcut7", addKey(SDLK_7), emptyKey, @@ -3283,7 +3283,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::PET_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyPetEmoteShortcut8", addKey(SDLK_8), emptyKey, @@ -3292,7 +3292,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::PET_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyPetEmoteShortcut9", addKey(SDLK_9), emptyKey, @@ -3301,7 +3301,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::PET_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyPetEmoteShortcut10", addKey(SDLK_0), emptyKey, @@ -3310,7 +3310,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::PET_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyPetEmoteShortcut11", addKey(SDLK_MINUS), emptyKey, @@ -3319,7 +3319,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::PET_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyPetEmoteShortcut12", addKey(SDLK_EQUALS), emptyKey, @@ -3328,7 +3328,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::PET_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyPetEmoteShortcut13", addKey(SDLK_BACKSPACE), emptyKey, @@ -3337,7 +3337,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::PET_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyPetEmoteShortcut14", addKey(SDLK_INSERT), emptyKey, @@ -3346,7 +3346,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::PET_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyPetEmoteShortcut15", addKey(SDLK_HOME), emptyKey, @@ -3355,7 +3355,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::PET_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyPetEmoteShortcut16", addKey(SDLK_q), emptyKey, @@ -3364,7 +3364,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::PET_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyPetEmoteShortcut17", addKey(SDLK_w), emptyKey, @@ -3373,7 +3373,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::PET_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyPetEmoteShortcut18", addKey(SDLK_e), emptyKey, @@ -3382,7 +3382,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::PET_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyPetEmoteShortcut19", addKey(SDLK_r), emptyKey, @@ -3391,7 +3391,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::PET_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyPetEmoteShortcut20", addKey(SDLK_t), emptyKey, @@ -3400,7 +3400,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::PET_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyPetEmoteShortcut21", addKey(SDLK_y), emptyKey, @@ -3409,7 +3409,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::PET_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyPetEmoteShortcut22", addKey(SDLK_u), emptyKey, @@ -3418,7 +3418,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::PET_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyPetEmoteShortcut23", addKey(SDLK_i), emptyKey, @@ -3427,7 +3427,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::PET_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyPetEmoteShortcut24", addKey(SDLK_o), emptyKey, @@ -3436,7 +3436,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::PET_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyPetEmoteShortcut25", addKey(SDLK_p), emptyKey, @@ -3445,7 +3445,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::PET_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyPetEmoteShortcut26", addKey(SDLK_LEFTBRACKET), emptyKey, @@ -3454,7 +3454,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::PET_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyPetEmoteShortcut27", addKey(SDLK_RIGHTBRACKET), emptyKey, @@ -3463,7 +3463,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::PET_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyPetEmoteShortcut28", addKey(SDLK_BACKSLASH), emptyKey, @@ -3472,7 +3472,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::PET_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyPetEmoteShortcut29", addKey(SDLK_a), emptyKey, @@ -3481,7 +3481,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::PET_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyPetEmoteShortcut30", addKey(SDLK_s), emptyKey, @@ -3490,7 +3490,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::PET_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyPetEmoteShortcut31", addKey(SDLK_d), emptyKey, @@ -3499,7 +3499,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::PET_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyPetEmoteShortcut32", addKey(SDLK_f), emptyKey, @@ -3508,7 +3508,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::PET_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyPetEmoteShortcut33", addKey(SDLK_g), emptyKey, @@ -3517,7 +3517,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::PET_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyPetEmoteShortcut34", addKey(SDLK_h), emptyKey, @@ -3526,7 +3526,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::PET_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyPetEmoteShortcut35", addKey(SDLK_j), emptyKey, @@ -3535,7 +3535,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::PET_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyPetEmoteShortcut36", addKey(SDLK_k), emptyKey, @@ -3544,7 +3544,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::PET_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyPetEmoteShortcut37", addKey(SDLK_l), emptyKey, @@ -3553,7 +3553,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::PET_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyPetEmoteShortcut38", addKey(SDLK_SEMICOLON), emptyKey, @@ -3562,7 +3562,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::PET_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyPetEmoteShortcut39", addKey(SDLK_QUOTE), emptyKey, @@ -3571,7 +3571,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::PET_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyPetEmoteShortcut40", addKey(SDLK_z), emptyKey, @@ -3580,7 +3580,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::PET_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyPetEmoteShortcut41", addKey(SDLK_x), emptyKey, @@ -3589,7 +3589,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::PET_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyPetEmoteShortcut42", addKey(SDLK_c), emptyKey, @@ -3598,7 +3598,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::PET_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyPetEmoteShortcut43", addKey(SDLK_v), emptyKey, @@ -3607,7 +3607,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::PET_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyPetEmoteShortcut44", addKey(SDLK_b), emptyKey, @@ -3616,7 +3616,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::PET_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyPetEmoteShortcut45", addKey(SDLK_n), emptyKey, @@ -3625,7 +3625,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::PET_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyPetEmoteShortcut46", addKey(SDLK_m), emptyKey, @@ -3634,7 +3634,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::PET_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyPetEmoteShortcut47", addKey(SDLK_COMMA), emptyKey, @@ -3643,7 +3643,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::PET_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyPetEmoteShortcut48", addKey(SDLK_PERIOD), emptyKey, @@ -3652,12 +3652,12 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::PET_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyCatchPet", defaultAction(&Actions::catchPet), InputCondition::INGAME, "catchpet|catch", - true}, + UseArgs_true}, {"keyChatServerIgnoreWhisper", emptyKey, emptyKey, @@ -3666,7 +3666,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::INGAME, "serverignore", - false}, + UseArgs_false}, {"keyChatServerUnIgnoreWhisper", emptyKey, emptyKey, @@ -3675,37 +3675,37 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::INGAME, "serverunignore", - false}, + UseArgs_false}, {"keyMercenaryFire", defaultAction(&Actions::mercenaryFire), InputCondition::INGAME, "mercenaryfire|firemercenary", - false}, + UseArgs_false}, {"keyTargetMercenary", defaultAction(&Actions::targetMercenary), InputCondition::INGAME | InputCondition::NOTARGET, "targetmercenary", - false}, + UseArgs_false}, {"keyTargetPet", defaultAction(&Actions::targetPet), InputCondition::INGAME | InputCondition::NOTARGET, "targetpet", - false}, + UseArgs_false}, {"keyPetSetName", defaultAction(&Actions::setPetName), InputCondition::INGAME, "setpetname|petsetname", - false}, + UseArgs_false}, {"keyHomunculusSetName", defaultAction(&Actions::setHomunculusName), InputCondition::INGAME, "sethomunname|homunsetname|sethomunculusname|homunculussetname", - false}, + UseArgs_false}, {"keyHomunculusFire", defaultAction(&Actions::fireHomunculus), InputCondition::INGAME, "firehomunculus|homunculusfire", - false}, + UseArgs_false}, {"keyWindowBank", emptyKey, emptyKey, @@ -3714,7 +3714,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::SHORTCUT0, "bank|openbank", - false}, + UseArgs_false}, {"keyInventoryPrevTab", emptyKey, emptyKey, @@ -3723,7 +3723,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::NOINPUT | InputCondition::INGAME, "previnvtab", - false}, + UseArgs_false}, {"keyInventoryNextTab", emptyKey, emptyKey, @@ -3732,268 +3732,268 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::NOINPUT | InputCondition::INGAME, "nextinvtab", - false}, + UseArgs_false}, {"keyContextMenu", defaultAction(&Actions::contextMenu), InputCondition::NOINPUT | InputCondition::NOAWAY | InputCondition::NOMODAL | InputCondition::INGAME, "contextmenu", - false}, + UseArgs_false}, {"keyBuy", defaultAction(&Actions::buy), InputCondition::GAME, "buy", - false}, + UseArgs_false}, {"keySell", defaultAction(&Actions::sell), InputCondition::GAME, "sell", - false}, + UseArgs_false}, {"keyWhisper2", defaultAction(&Actions::msg2), InputCondition::INGAME, "w2|whisper2|msg2", - true}, + UseArgs_true}, {"keyGuild", defaultAction(&Actions::guild), InputCondition::INGAME, "guild", - true}, + UseArgs_true}, {"keyNuke", defaultAction(&Actions::chatNuke), InputCondition::INGAME, "nuke", - true}, + UseArgs_true}, {"keyUse", defaultAction(&Actions::useItem), InputCondition::INGAME, "use|useitem", - true}, + UseArgs_true}, {"keyChatAdd", defaultAction(&Actions::chatAdd), InputCondition::INGAME, "addchat|chatadd", - true}, + UseArgs_true}, {"keyWhisperText", defaultAction(&Actions::msgText), InputCondition::INGAME, "wt|whispertext|msgtext", - true}, + UseArgs_true}, {"keyNavigateTo", defaultAction(&Actions::navigateTo), InputCondition::INGAME, "navigateto", - true}, + UseArgs_true}, {"keyCameraMove", defaultAction(&Actions::moveCamera), InputCondition::INGAME, "movecamera|cameramove", - true}, + UseArgs_true}, {"keyDropItem", defaultAction(&Actions::dropItemId), InputCondition::INGAME, "dropitem", - true}, + UseArgs_true}, {"keyDropItemAll", defaultAction(&Actions::dropItemIdAll), InputCondition::INGAME, "dropitemall", - true}, + UseArgs_true}, {"keyDropInv", defaultAction(&Actions::dropItemInv), InputCondition::INGAME, "dropinv", - true}, + UseArgs_true}, {"keyDropInvAll", defaultAction(&Actions::dropItemInvAll), InputCondition::INGAME, "dropinvall", - true}, + UseArgs_true}, {"keyUseInv", defaultAction(&Actions::useItemInv), InputCondition::INGAME, "useinv", - true}, + UseArgs_true}, {"keyInvToStorage", defaultAction(&Actions::invToStorage), InputCondition::INGAME, "invtostorage|invstorage", - true}, + UseArgs_true}, {"keyTradeAdd", defaultAction(&Actions::tradeAdd), InputCondition::INGAME, "tradeadd|addtrade", - true}, + UseArgs_true}, {"keyStorageToInv", defaultAction(&Actions::storageToInv), InputCondition::INGAME, "storagetoinv|storageinv", - true}, + UseArgs_true}, {"keyProtectItem", defaultAction(&Actions::protectItem), InputCondition::INGAME, "protectitem|itemprotect", - true}, + UseArgs_true}, {"keyUnProtectItem", defaultAction(&Actions::unprotectItem), InputCondition::INGAME, "unprotectitem|itemunprotect", - true}, + UseArgs_true}, {"keyKickParty", defaultAction(&Actions::kickParty), InputCondition::INGAME, "kickparty|partykick", - true}, + UseArgs_true}, {"keyAddText", defaultAction(&Actions::addText), InputCondition::INGAME, "addtext|textadd", - true}, + UseArgs_true}, {"keyKick", defaultAction(&Actions::kick), InputCondition::INGAME, "kick", - true}, + UseArgs_true}, {"keyLeaveParty", defaultAction(&Actions::leaveParty), InputCondition::INGAME, "leaveparty|partyleave", - true}, + UseArgs_true}, {"keyWarp", defaultAction(&Actions::warp), InputCondition::INGAME, "warp", - true}, + UseArgs_true}, {"keyClearChat", defaultAction(&Actions::clearChat), InputCondition::INGAME, "clearchat|chatclear", - false}, + UseArgs_false}, {"keyPetMoveUp", defaultAction(&Actions::petMoveUp), InputCondition::INGAME, "petmoveup|moveuppet", - false}, + UseArgs_false}, {"keyPetMoveDown", defaultAction(&Actions::petMoveDown), InputCondition::INGAME, "petmovedown|movedownpet", - false}, + UseArgs_false}, {"keyPetMoveLeft", defaultAction(&Actions::petMoveLeft), InputCondition::INGAME, "petmoveleft|moveleftpet", - false}, + UseArgs_false}, {"keyPetMoveRight", defaultAction(&Actions::petMoveRight), InputCondition::INGAME, "petmoveright|moverightpet", - false}, + UseArgs_false}, {"keyPetDirectUp", defaultAction(&Actions::petDirectUp), InputCondition::INGAME, "petdirectup|directuppet", - false}, + UseArgs_false}, {"keyPetDirectDown", defaultAction(&Actions::petDirectDown), InputCondition::INGAME, "petdirectdown|directdownpet", - false}, + UseArgs_false}, {"keyPetDirectLeft", defaultAction(&Actions::petDirectLeft), InputCondition::INGAME, "petdirectleft|directleftpet", - false}, + UseArgs_false}, {"keyPetDirectRight", defaultAction(&Actions::petDirectRight), InputCondition::INGAME, "petdirectright|directrightpet", - false}, + UseArgs_false}, {"keyPetAiStart", defaultAction(&Actions::petAiStart), InputCondition::INGAME, "petaistart|startpetai|enablepetai|petaienable", - false}, + UseArgs_false}, {"keyPetAiStop", defaultAction(&Actions::petAiStop), InputCondition::INGAME, "petaistop|stoppetai|disablepetai|petaidisable", - false}, + UseArgs_false}, {"keyGeneralTab", defaultAction(&Actions::chatGeneralTab), InputCondition::INGAME, "generaltab|generalchattab|general", - false}, + UseArgs_false}, {"keyDebugTab", defaultAction(&Actions::chatDebugTab), InputCondition::INGAME, "debugtab|debugchattab", - false}, + UseArgs_false}, {"keyBattleTab", defaultAction(&Actions::chatBattleTab), InputCondition::INGAME, "battletab|battlechattab", - false}, + UseArgs_false}, {"keyTradeTab", defaultAction(&Actions::chatTradeTab), InputCondition::INGAME, "tradetab|tradechattab", - false}, + UseArgs_false}, {"keyLangTab", defaultAction(&Actions::chatLangTab), InputCondition::INGAME, "langtab|langchattab", - false}, + UseArgs_false}, {"keyGmTab", defaultAction(&Actions::chatGmTab), InputCondition::INGAME, "gmtab|gmchattab", - false}, + UseArgs_false}, {"keyPartyTab", defaultAction(&Actions::chatPartyTab), InputCondition::INGAME, "partytab|partychattab", - false}, + UseArgs_false}, {"keyGuildTab", defaultAction(&Actions::chatGuildTab), InputCondition::INGAME, "guildtab|guildchattab", - false}, + UseArgs_false}, {"keyDropClear", defaultAction(&Actions::clearDrop), InputCondition::INGAME, "cleardrops|cleardrop|cleardropwindow|dropclear|dropsclear", - false}, + UseArgs_false}, {"keyWindowCart", defaultAction(&Actions::cartWindowShow), InputCondition::SHORTCUT0, "cart|opencart", - false}, + UseArgs_false}, {"keyMagicHealMostDamaged", defaultAction(&Actions::healmd), InputCondition::GAME | InputCondition::VALIDSPEED, "healmd|saveass", - false}, + UseArgs_false}, {"keyPetMove", defaultAction(&Actions::petMove), InputCondition::INGAME, "movepet|petmove", - true}, + UseArgs_true}, {"keyHomunTalk", defaultAction(&Actions::homunTalk), InputCondition::INGAME, "homuntalk|merctalk", - true}, + UseArgs_true}, {"keyHomunEmote", defaultAction(&Actions::commandHomunEmote), InputCondition::INGAME, "homunemote|mercemote", - true}, + UseArgs_true}, {"keyHomunSmilie", defaultAction(nullptr), InputCondition::DEFAULT | InputCondition::INGAME, "", - false}, + UseArgs_false}, {"keyHomunEmoteShortcut1", addKey(SDLK_1), emptyKey, @@ -4002,7 +4002,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::HOMUN_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyHomunEmoteShortcut2", addKey(SDLK_2), emptyKey, @@ -4011,7 +4011,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::HOMUN_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyHomunEmoteShortcut3", addKey(SDLK_3), emptyKey, @@ -4020,7 +4020,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::HOMUN_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyHomunEmoteShortcut4", addKey(SDLK_4), emptyKey, @@ -4029,7 +4029,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::HOMUN_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyHomunEmoteShortcut5", addKey(SDLK_5), emptyKey, @@ -4038,7 +4038,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::HOMUN_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyHomunEmoteShortcut6", addKey(SDLK_6), emptyKey, @@ -4047,7 +4047,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::HOMUN_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyHomunEmoteShortcut7", addKey(SDLK_7), emptyKey, @@ -4056,7 +4056,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::HOMUN_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyHomunEmoteShortcut8", addKey(SDLK_8), emptyKey, @@ -4065,7 +4065,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::HOMUN_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyHomunEmoteShortcut9", addKey(SDLK_9), emptyKey, @@ -4074,7 +4074,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::HOMUN_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyHomunEmoteShortcut10", addKey(SDLK_0), emptyKey, @@ -4083,7 +4083,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::HOMUN_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyHomunEmoteShortcut11", addKey(SDLK_MINUS), emptyKey, @@ -4092,7 +4092,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::HOMUN_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyHomunEmoteShortcut12", addKey(SDLK_EQUALS), emptyKey, @@ -4101,7 +4101,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::HOMUN_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyHomunEmoteShortcut13", addKey(SDLK_BACKSPACE), emptyKey, @@ -4110,7 +4110,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::HOMUN_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyHomunEmoteShortcut14", addKey(SDLK_INSERT), emptyKey, @@ -4119,7 +4119,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::HOMUN_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyHomunEmoteShortcut15", addKey(SDLK_HOME), emptyKey, @@ -4128,7 +4128,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::HOMUN_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyHomunEmoteShortcut16", addKey(SDLK_q), emptyKey, @@ -4137,7 +4137,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::HOMUN_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyHomunEmoteShortcut17", addKey(SDLK_w), emptyKey, @@ -4146,7 +4146,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::HOMUN_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyHomunEmoteShortcut18", addKey(SDLK_e), emptyKey, @@ -4155,7 +4155,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::HOMUN_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyHomunEmoteShortcut19", addKey(SDLK_r), emptyKey, @@ -4164,7 +4164,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::HOMUN_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyHomunEmoteShortcut20", addKey(SDLK_t), emptyKey, @@ -4173,7 +4173,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::HOMUN_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyHomunEmoteShortcut21", addKey(SDLK_y), emptyKey, @@ -4182,7 +4182,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::HOMUN_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyHomunEmoteShortcut22", addKey(SDLK_u), emptyKey, @@ -4191,7 +4191,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::HOMUN_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyHomunEmoteShortcut23", addKey(SDLK_i), emptyKey, @@ -4200,7 +4200,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::HOMUN_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyHomunEmoteShortcut24", addKey(SDLK_o), emptyKey, @@ -4209,7 +4209,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::HOMUN_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyHomunEmoteShortcut25", addKey(SDLK_p), emptyKey, @@ -4218,7 +4218,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::HOMUN_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyHomunEmoteShortcut26", addKey(SDLK_LEFTBRACKET), emptyKey, @@ -4227,7 +4227,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::HOMUN_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyHomunEmoteShortcut27", addKey(SDLK_RIGHTBRACKET), emptyKey, @@ -4236,7 +4236,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::HOMUN_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyHomunEmoteShortcut28", addKey(SDLK_BACKSLASH), emptyKey, @@ -4245,7 +4245,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::HOMUN_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyHomunEmoteShortcut29", addKey(SDLK_a), emptyKey, @@ -4254,7 +4254,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::HOMUN_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyHomunEmoteShortcut30", addKey(SDLK_s), emptyKey, @@ -4263,7 +4263,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::HOMUN_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyHomunEmoteShortcut31", addKey(SDLK_d), emptyKey, @@ -4272,7 +4272,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::HOMUN_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyHomunEmoteShortcut32", addKey(SDLK_f), emptyKey, @@ -4281,7 +4281,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::HOMUN_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyHomunEmoteShortcut33", addKey(SDLK_g), emptyKey, @@ -4290,7 +4290,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::HOMUN_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyHomunEmoteShortcut34", addKey(SDLK_h), emptyKey, @@ -4299,7 +4299,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::HOMUN_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyHomunEmoteShortcut35", addKey(SDLK_j), emptyKey, @@ -4308,7 +4308,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::HOMUN_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyHomunEmoteShortcut36", addKey(SDLK_k), emptyKey, @@ -4317,7 +4317,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::HOMUN_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyHomunEmoteShortcut37", addKey(SDLK_l), emptyKey, @@ -4326,7 +4326,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::HOMUN_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyHomunEmoteShortcut38", addKey(SDLK_SEMICOLON), emptyKey, @@ -4335,7 +4335,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::HOMUN_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyHomunEmoteShortcut39", addKey(SDLK_QUOTE), emptyKey, @@ -4344,7 +4344,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::HOMUN_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyHomunEmoteShortcut40", addKey(SDLK_z), emptyKey, @@ -4353,7 +4353,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::HOMUN_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyHomunEmoteShortcut41", addKey(SDLK_x), emptyKey, @@ -4362,7 +4362,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::HOMUN_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyHomunEmoteShortcut42", addKey(SDLK_c), emptyKey, @@ -4371,7 +4371,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::HOMUN_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyHomunEmoteShortcut43", addKey(SDLK_v), emptyKey, @@ -4380,7 +4380,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::HOMUN_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyHomunEmoteShortcut44", addKey(SDLK_b), emptyKey, @@ -4389,7 +4389,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::HOMUN_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyHomunEmoteShortcut45", addKey(SDLK_n), emptyKey, @@ -4398,7 +4398,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::HOMUN_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyHomunEmoteShortcut46", addKey(SDLK_m), emptyKey, @@ -4407,7 +4407,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::HOMUN_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyHomunEmoteShortcut47", addKey(SDLK_COMMA), emptyKey, @@ -4416,7 +4416,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::HOMUN_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyHomunEmoteShortcut48", addKey(SDLK_PERIOD), emptyKey, @@ -4425,32 +4425,32 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::HOMUN_EMOTE, 100, InputCondition::GAME, "", - false}, + UseArgs_false}, {"keyKickGuild", defaultAction(&Actions::kickGuild), InputCondition::INGAME, "kickguild|guildkick", - true}, + UseArgs_true}, {"keyHat", defaultAction(&Actions::hat), InputCondition::INGAME, "hat|hats|showhat", - false}, + UseArgs_false}, {"keyCreatePublicRoom", defaultAction(&Actions::createPublicChatRoom), InputCondition::INGAME, "createroom|createpublicroom", - true}, + UseArgs_true}, {"keyJoinRoom", defaultAction(&Actions::joinChatRoom), InputCondition::INGAME, "joinroom", - true}, + UseArgs_true}, {"keyLeaveRoom", defaultAction(&Actions::leaveChatRoom), InputCondition::INGAME, "leaveroom", - false}, + UseArgs_false}, {"keyWindowStatusBar", emptyKey, emptyKey, @@ -4459,7 +4459,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::NOTARGET, "yellowbar|quickoptions", - false}, + UseArgs_false}, {"keyWindowMail", emptyKey, emptyKey, @@ -4468,27 +4468,27 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::NOTARGET, "mailwindow|mail", - false}, + UseArgs_false}, {"keyConfSet", defaultAction(&Actions::confSet), InputCondition::INGAME, "confset|setconf", - true}, + UseArgs_true}, {"keyServerConfSet", defaultAction(&Actions::serverConfSet), InputCondition::INGAME, "servconfset|setservconf", - true}, + UseArgs_true}, {"keyConfGet", defaultAction(&Actions::confGet), InputCondition::INGAME, "confget|getconf", - true}, + UseArgs_true}, {"keyServerConfGet", defaultAction(&Actions::serverConfGet), InputCondition::INGAME, "servconfget|getservconf", - true}, + UseArgs_true}, }; #undef defaultAction diff --git a/src/input/inputmanager.cpp b/src/input/inputmanager.cpp index 35272f6e8..8b5cb97e2 100644 --- a/src/input/inputmanager.cpp +++ b/src/input/inputmanager.cpp @@ -920,7 +920,7 @@ void InputManager::addChatCommands(std::list &arr) FOR_EACH (StringVectCIter, it, tokens) { cmd = std::string("/").append(*it); - if (ad.useArgs) + if (ad.useArgs == UseArgs_true) cmd.append(" "); arr.push_back(cmd); } -- cgit v1.2.3-60-g2f50