diff options
Diffstat (limited to 'src/input')
| -rw-r--r-- | src/input/inputactionmap.h | 1613 | ||||
| -rw-r--r-- | src/input/inputmanager.cpp | 15 | ||||
| -rw-r--r-- | src/input/inputmanager.h | 2 | ||||
| -rw-r--r-- | src/input/touch/touchactions.cpp | 2 |
4 files changed, 924 insertions, 708 deletions
diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h index 6017d95dc..bd4e7af26 100644 --- a/src/input/inputactionmap.h +++ b/src/input/inputactionmap.h @@ -64,7 +64,7 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::moveUp, InputAction::NO_VALUE, 50, - InputCondition::ARROWKEYS, + InputCondition::KEY_DOWN | InputCondition::ARROWKEYS, "", UseArgs_false, Protected_false}, @@ -74,7 +74,7 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::moveDown, InputAction::NO_VALUE, 50, - InputCondition::ARROWKEYS, + InputCondition::KEY_DOWN | InputCondition::ARROWKEYS, "", UseArgs_false, Protected_false}, @@ -84,7 +84,7 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::moveLeft, InputAction::NO_VALUE, 50, - InputCondition::ARROWKEYS, + InputCondition::KEY_DOWN | InputCondition::ARROWKEYS, "", UseArgs_false, Protected_false}, @@ -94,7 +94,7 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::moveRight, InputAction::NO_VALUE, 50, - InputCondition::ARROWKEYS, + InputCondition::KEY_DOWN | InputCondition::ARROWKEYS, "", UseArgs_false, Protected_false}, @@ -104,8 +104,10 @@ static const InputActionData inputActionData Input::GRP_DEFAULT | Input::GRP_REPEAT, &Actions::attack, InputAction::NO_VALUE, 50, - InputCondition::GAME | InputCondition::NOFOLLOW - | InputCondition::VALIDSPEED, + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::NOFOLLOW | + InputCondition::VALIDSPEED, "attack", UseArgs_false, Protected_false}, @@ -115,8 +117,11 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::targetAttack, InputAction::NO_VALUE, 50, - InputCondition::GAME | InputCondition::NOFOLLOW - | InputCondition::VALIDSPEED | InputCondition::ALIVE, + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::NOFOLLOW | + InputCondition::VALIDSPEED | + InputCondition::ALIVE, "targetattack", UseArgs_true, Protected_false}, @@ -126,7 +131,9 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::moveToTarget, InputAction::NO_VALUE, 50, - InputCondition::GAME | InputCondition::VALIDSPEED, + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::VALIDSPEED, "movetotarget", UseArgs_false, Protected_false}, @@ -136,8 +143,10 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::changeMoveToTarget, InputAction::NO_VALUE, 50, - InputCondition::GAME | InputCondition::VALIDSPEED - | InputCondition::EMODS, + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::VALIDSPEED | + InputCondition::EMODS, "", UseArgs_false, Protected_true}, @@ -147,7 +156,9 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::moveToHome, InputAction::NO_VALUE, 50, - InputCondition::GAME | InputCondition::VALIDSPEED, + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::VALIDSPEED, "movetohome", UseArgs_false, Protected_false}, @@ -157,7 +168,9 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::setHome, InputAction::NO_VALUE, 50, - InputCondition::GAME | InputCondition::VALIDSPEED, + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::VALIDSPEED, "sethome", UseArgs_false, Protected_true}, @@ -167,7 +180,9 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, nullptr, InputAction::NO_VALUE, 50, - InputCondition::DEFAULT | InputCondition::INGAME, + InputCondition::KEY_DOWN | + InputCondition::DEFAULT | + InputCondition::INGAME, "", UseArgs_false, Protected_false}, @@ -177,7 +192,7 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::talk, InputAction::NO_VALUE, 50, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "talk", UseArgs_false, Protected_false}, @@ -187,13 +202,13 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::stopAttack, InputAction::NO_VALUE, 50, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "stopattack", UseArgs_false, Protected_false}, {"keyUnTarget", defaultAction(&Actions::untarget), - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "untarget", UseArgs_false, Protected_false}, @@ -203,8 +218,10 @@ static const InputActionData inputActionData Input::GRP_DEFAULT | Input::GRP_REPEAT, &Actions::targetMonster, InputAction::NO_VALUE, 50, - InputCondition::GAME | InputCondition::NOTARGET - | InputCondition::VALIDSPEED, + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::NOTARGET | + InputCondition::VALIDSPEED, "targetmonster", UseArgs_false, Protected_false}, @@ -214,7 +231,9 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::targetNPC, InputAction::NO_VALUE, 50, - InputCondition::GAME | InputCondition::NOTARGET, + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::NOTARGET, "targetnpc", UseArgs_false, Protected_false}, @@ -224,7 +243,9 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::targetPlayer, InputAction::NO_VALUE, 50, - InputCondition::GAME | InputCondition::NOTARGET, + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::NOTARGET, "targetplayer", UseArgs_false, Protected_false}, @@ -234,7 +255,9 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::pickup, InputAction::NO_VALUE, 50, - InputCondition::GAME | InputCondition::NOTARGET, + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::NOTARGET, "pickup", UseArgs_false, Protected_false}, @@ -244,8 +267,10 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::changePickupType, InputAction::NO_VALUE, 50, - InputCondition::GAME | InputCondition::VALIDSPEED - | InputCondition::EMODS, + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::VALIDSPEED | + InputCondition::EMODS, "", UseArgs_false, Protected_true}, @@ -255,7 +280,9 @@ static const InputActionData inputActionData Input::GRP_DEFAULT | Input::GRP_GUI, &Actions::hideWindows, InputAction::NO_VALUE, 50, - InputCondition::GAME | InputCondition::NOTARGET, + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::NOTARGET, "hidewindows", UseArgs_false, Protected_true}, @@ -265,7 +292,10 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::sit, InputAction::NO_VALUE, 50, - InputCondition::GAME | InputCondition::NOTARGET | + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::NOTARGET | + InputCondition::KEY_DOWN | InputCondition::NOBLOCK, "sit", UseArgs_false, @@ -276,7 +306,9 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::screenshot, InputAction::NO_VALUE, 50, - InputCondition::NOTARGET | InputCondition::NOINPUT, + InputCondition::KEY_DOWN | + InputCondition::NOTARGET | + InputCondition::NOINPUT, "screenshot", UseArgs_false, Protected_true}, @@ -286,7 +318,9 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::changeTrade, InputAction::NO_VALUE, 50, - InputCondition::GAME | InputCondition::NOTARGET, + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::NOTARGET, "changetrade", UseArgs_false, Protected_true}, @@ -296,8 +330,10 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::changeMapMode, InputAction::NO_VALUE, 50, - InputCondition::GAME | InputCondition::NOTARGET - | InputCondition::EMODS, + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::NOTARGET | + InputCondition::EMODS, "", UseArgs_false, Protected_false}, @@ -307,8 +343,10 @@ static const InputActionData inputActionData Input::GRP_DEFAULT | Input::GRP_GUI, &Actions::ok, InputAction::NO_VALUE, 50, - InputCondition::NOMODAL | InputCondition::NOAWAY - | InputCondition::NONPCINPUT, + InputCondition::KEY_DOWN | + InputCondition::NOMODAL | + InputCondition::NOAWAY | + InputCondition::NONPCINPUT, "", UseArgs_false, Protected_false}, @@ -322,7 +360,7 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::quit, InputAction::NO_VALUE, 50, - InputCondition::DEFAULT, + InputCondition::KEY_DOWN | InputCondition::DEFAULT, "quit", UseArgs_false, Protected_true}, @@ -332,7 +370,9 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, nullptr, InputAction::NO_VALUE, 50, - InputCondition::DEFAULT | InputCondition::INGAME, + InputCondition::KEY_DOWN | + InputCondition::DEFAULT | + InputCondition::INGAME, "", UseArgs_false, Protected_true}, @@ -342,7 +382,7 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::shortcut, InputAction::NO_VALUE, 50, - InputCondition::SHORTCUT, + InputCondition::KEY_DOWN | InputCondition::SHORTCUT, "", UseArgs_false, Protected_true}, @@ -352,7 +392,7 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::shortcut, InputAction::NO_VALUE, 50, - InputCondition::SHORTCUT, + InputCondition::KEY_DOWN | InputCondition::SHORTCUT, "", UseArgs_false, Protected_true}, @@ -362,7 +402,7 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::shortcut, InputAction::NO_VALUE, 50, - InputCondition::SHORTCUT, + InputCondition::KEY_DOWN | InputCondition::SHORTCUT, "", UseArgs_false, Protected_true}, @@ -372,7 +412,7 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::shortcut, InputAction::NO_VALUE, 50, - InputCondition::SHORTCUT, + InputCondition::KEY_DOWN | InputCondition::SHORTCUT, "", UseArgs_false, Protected_true}, @@ -382,7 +422,7 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::shortcut, InputAction::NO_VALUE, 50, - InputCondition::SHORTCUT, + InputCondition::KEY_DOWN | InputCondition::SHORTCUT, "", UseArgs_false, Protected_true}, @@ -392,7 +432,7 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::shortcut, InputAction::NO_VALUE, 50, - InputCondition::SHORTCUT, + InputCondition::KEY_DOWN | InputCondition::SHORTCUT, "", UseArgs_false, Protected_true}, @@ -402,7 +442,7 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::shortcut, InputAction::NO_VALUE, 50, - InputCondition::SHORTCUT, + InputCondition::KEY_DOWN | InputCondition::SHORTCUT, "", UseArgs_false, Protected_true}, @@ -412,7 +452,7 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::shortcut, InputAction::NO_VALUE, 50, - InputCondition::SHORTCUT, + InputCondition::KEY_DOWN | InputCondition::SHORTCUT, "", UseArgs_false, Protected_true}, @@ -422,7 +462,7 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::shortcut, InputAction::NO_VALUE, 50, - InputCondition::SHORTCUT, + InputCondition::KEY_DOWN | InputCondition::SHORTCUT, "", UseArgs_false, Protected_true}, @@ -432,7 +472,7 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::shortcut, InputAction::NO_VALUE, 50, - InputCondition::SHORTCUT, + InputCondition::KEY_DOWN | InputCondition::SHORTCUT, "", UseArgs_false, Protected_true}, @@ -442,7 +482,7 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::shortcut, InputAction::NO_VALUE, 50, - InputCondition::SHORTCUT, + InputCondition::KEY_DOWN | InputCondition::SHORTCUT, "", UseArgs_false, Protected_true}, @@ -452,7 +492,7 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::shortcut, InputAction::NO_VALUE, 50, - InputCondition::SHORTCUT, + InputCondition::KEY_DOWN | InputCondition::SHORTCUT, "", UseArgs_false, Protected_true}, @@ -462,7 +502,7 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::shortcut, InputAction::NO_VALUE, 50, - InputCondition::SHORTCUT, + InputCondition::KEY_DOWN | InputCondition::SHORTCUT, "", UseArgs_false, Protected_true}, @@ -472,7 +512,7 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::shortcut, InputAction::NO_VALUE, 50, - InputCondition::SHORTCUT, + InputCondition::KEY_DOWN | InputCondition::SHORTCUT, "", UseArgs_false, Protected_true}, @@ -482,37 +522,37 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::shortcut, InputAction::NO_VALUE, 50, - InputCondition::SHORTCUT, + InputCondition::KEY_DOWN | InputCondition::SHORTCUT, "", UseArgs_false, Protected_true}, {"keyShortcut16", defaultAction(&Actions::shortcut), - InputCondition::SHORTCUT, + InputCondition::KEY_DOWN | InputCondition::SHORTCUT, "", UseArgs_false, Protected_true}, {"keyShortcut17", defaultAction(&Actions::shortcut), - InputCondition::SHORTCUT, + InputCondition::KEY_DOWN | InputCondition::SHORTCUT, "", UseArgs_false, Protected_true}, {"keyShortcut18", defaultAction(&Actions::shortcut), - InputCondition::SHORTCUT, + InputCondition::KEY_DOWN | InputCondition::SHORTCUT, "", UseArgs_false, Protected_true}, {"keyShortcut19", defaultAction(&Actions::shortcut), - InputCondition::SHORTCUT, + InputCondition::KEY_DOWN | InputCondition::SHORTCUT, "", UseArgs_false, Protected_true}, {"keyShortcut20", defaultAction(&Actions::shortcut), - InputCondition::SHORTCUT, + InputCondition::KEY_DOWN | InputCondition::SHORTCUT, "", UseArgs_false, Protected_true}, @@ -522,7 +562,7 @@ static const InputActionData inputActionData Input::GRP_DEFAULT | Input::GRP_GUI, &Actions::helpWindowShow, InputAction::NO_VALUE, 50, - InputCondition::SHORTCUT0, + InputCondition::KEY_DOWN | InputCondition::SHORTCUT0, "help|openhelp", UseArgs_false, Protected_false}, @@ -532,7 +572,9 @@ static const InputActionData inputActionData Input::GRP_DEFAULT | Input::GRP_GUI, &Actions::statusWindowShow, InputAction::NO_VALUE, 50, - InputCondition::GAME | InputCondition::NOTARGET, + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::NOTARGET, "status|openstatus", UseArgs_false, Protected_false}, @@ -542,7 +584,9 @@ static const InputActionData inputActionData Input::GRP_DEFAULT | Input::GRP_GUI, &Actions::inventoryWindowShow, InputAction::NO_VALUE, 50, - InputCondition::GAME | InputCondition::NOTARGET, + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::NOTARGET, "inventory|openinventory", UseArgs_false, Protected_false}, @@ -552,7 +596,9 @@ static const InputActionData inputActionData Input::GRP_DEFAULT | Input::GRP_GUI, &Actions::equipmentWindowShow, InputAction::NO_VALUE, 50, - InputCondition::GAME | InputCondition::NOTARGET, + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::NOTARGET, "equipment|openequipment", UseArgs_false, Protected_false}, @@ -562,7 +608,9 @@ static const InputActionData inputActionData Input::GRP_DEFAULT | Input::GRP_GUI, &Actions::skillDialogShow, InputAction::NO_VALUE, 50, - InputCondition::GAME | InputCondition::NOTARGET, + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::NOTARGET, "skill|skills|openskills", UseArgs_false, Protected_false}, @@ -572,7 +620,9 @@ static const InputActionData inputActionData Input::GRP_DEFAULT | Input::GRP_GUI, &Actions::minimapWindowShow, InputAction::NO_VALUE, 50, - InputCondition::GAME | InputCondition::NOTARGET, + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::NOTARGET, "minimap|openminimap", UseArgs_false, Protected_false}, @@ -582,7 +632,7 @@ static const InputActionData inputActionData Input::GRP_DEFAULT | Input::GRP_GUI, &Actions::chatWindowShow, InputAction::NO_VALUE, 50, - InputCondition::SHORTCUT0, + InputCondition::KEY_DOWN | InputCondition::SHORTCUT0, "openchat", UseArgs_false, Protected_false}, @@ -592,7 +642,9 @@ static const InputActionData inputActionData Input::GRP_DEFAULT | Input::GRP_GUI, &Actions::shortcutWindowShow, InputAction::NO_VALUE, 50, - InputCondition::GAME | InputCondition::NOTARGET, + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::NOTARGET, "openshortcut|openshortcuts", UseArgs_false, Protected_false}, @@ -602,8 +654,10 @@ static const InputActionData inputActionData Input::GRP_DEFAULT | Input::GRP_GUI, &Actions::setupWindowShow, InputAction::NO_VALUE, 50, - InputCondition::NOTARGET | InputCondition::NOINPUT - | InputCondition::ENABLED, + InputCondition::KEY_DOWN | + InputCondition::NOTARGET | + InputCondition::NOINPUT | + InputCondition::ENABLED, "setup|opensetup", UseArgs_false, Protected_false}, @@ -613,7 +667,9 @@ static const InputActionData inputActionData Input::GRP_DEFAULT | Input::GRP_GUI, &Actions::debugWindowShow, InputAction::NO_VALUE, 50, - InputCondition::SHORTCUT0 | InputCondition::NOTARGET, + InputCondition::KEY_DOWN | + InputCondition::SHORTCUT0 | + InputCondition::NOTARGET, "debug|opendebug", UseArgs_false, Protected_false}, @@ -623,7 +679,9 @@ static const InputActionData inputActionData Input::GRP_DEFAULT | Input::GRP_GUI, &Actions::socialWindowShow, InputAction::NO_VALUE, 50, - InputCondition::GAME | InputCondition::NOTARGET, + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::NOTARGET, "social|opensocial", UseArgs_false, Protected_false}, @@ -633,7 +691,9 @@ static const InputActionData inputActionData Input::GRP_DEFAULT | Input::GRP_GUI, &Actions::emoteShortcutWindowShow, InputAction::NO_VALUE, 50, - InputCondition::GAME | InputCondition::NOTARGET, + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::NOTARGET, "emotes|openemotes", UseArgs_false, Protected_false}, @@ -643,7 +703,9 @@ static const InputActionData inputActionData Input::GRP_DEFAULT | Input::GRP_GUI, &Actions::outfitWindowShow, InputAction::NO_VALUE, 50, - InputCondition::GAME | InputCondition::NOTARGET, + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::NOTARGET, "openoutfit|openoutfits", UseArgs_false, Protected_false}, @@ -653,7 +715,9 @@ static const InputActionData inputActionData Input::GRP_DEFAULT | Input::GRP_GUI, &Actions::shopWindowShow, InputAction::NO_VALUE, 50, - InputCondition::GAME | InputCondition::NOTARGET, + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::NOTARGET, "shop|openshop", UseArgs_false, Protected_false}, @@ -663,7 +727,9 @@ static const InputActionData inputActionData Input::GRP_DEFAULT | Input::GRP_GUI, &Actions::dropShortcutWindowShow, InputAction::NO_VALUE, 50, - InputCondition::GAME | InputCondition::NOTARGET, + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::NOTARGET, "opendrop", UseArgs_false, Protected_false}, @@ -673,7 +739,9 @@ static const InputActionData inputActionData Input::GRP_DEFAULT | Input::GRP_GUI, &Actions::killStatsWindowShow, InputAction::NO_VALUE, 50, - InputCondition::GAME | InputCondition::NOTARGET, + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::NOTARGET, "kills|openkills", UseArgs_false, Protected_false}, @@ -683,7 +751,9 @@ static const InputActionData inputActionData Input::GRP_DEFAULT | Input::GRP_GUI, &Actions::spellShortcutWindowShow, InputAction::NO_VALUE, 50, - InputCondition::GAME | InputCondition::NOTARGET, + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::NOTARGET, "spells|openspells", UseArgs_false, Protected_false}, @@ -693,7 +763,9 @@ static const InputActionData inputActionData Input::GRP_DEFAULT | Input::GRP_GUI, nullptr, InputAction::NO_VALUE, 50, - InputCondition::GAME | InputCondition::NOTARGET, + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::NOTARGET, "", UseArgs_false, Protected_false}, @@ -703,7 +775,9 @@ static const InputActionData inputActionData Input::GRP_DEFAULT | Input::GRP_GUI, &Actions::whoIsOnlineWindowShow, InputAction::NO_VALUE, 50, - InputCondition::GAME | InputCondition::NOTARGET, + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::NOTARGET, "online|openonline", UseArgs_false, Protected_false}, @@ -713,7 +787,7 @@ static const InputActionData inputActionData Input::GRP_DEFAULT | Input::GRP_GUI, &Actions::didYouKnowWindowShow, InputAction::NO_VALUE, 50, - InputCondition::SHORTCUT0, + InputCondition::KEY_DOWN | InputCondition::SHORTCUT0, "didyouknow|opendidyouknow", UseArgs_false, Protected_false}, @@ -723,7 +797,9 @@ static const InputActionData inputActionData Input::GRP_DEFAULT | Input::GRP_GUI, &Actions::questsWindowShow, InputAction::NO_VALUE, 50, - InputCondition::GAME | InputCondition::NOTARGET, + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::NOTARGET, "quests|openquests", UseArgs_false, Protected_false}, @@ -733,7 +809,9 @@ static const InputActionData inputActionData Input::GRP_DEFAULT | Input::GRP_GUI, &Actions::prevSocialTab, InputAction::NO_VALUE, 50, - InputCondition::NOINPUT | InputCondition::INGAME, + InputCondition::KEY_DOWN | + InputCondition::NOINPUT | + InputCondition::INGAME, "prevsocialtab", UseArgs_false, Protected_false}, @@ -743,7 +821,9 @@ static const InputActionData inputActionData Input::GRP_DEFAULT | Input::GRP_GUI, &Actions::nextSocialTab, InputAction::NO_VALUE, 50, - InputCondition::NOINPUT | InputCondition::INGAME, + InputCondition::KEY_DOWN | + InputCondition::NOINPUT | + InputCondition::INGAME, "nextsocialtab", UseArgs_false, Protected_false}, @@ -753,7 +833,9 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, nullptr, InputAction::NO_VALUE, 50, - InputCondition::DEFAULT | InputCondition::INGAME, + InputCondition::KEY_DOWN | + InputCondition::DEFAULT | + InputCondition::INGAME, "", UseArgs_false, Protected_true}, @@ -763,7 +845,7 @@ static const InputActionData inputActionData Input::GRP_EMOTION, &Actions::emote, InputAction::EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -773,7 +855,7 @@ static const InputActionData inputActionData Input::GRP_EMOTION, &Actions::emote, InputAction::EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -783,7 +865,7 @@ static const InputActionData inputActionData Input::GRP_EMOTION, &Actions::emote, InputAction::EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -793,7 +875,7 @@ static const InputActionData inputActionData Input::GRP_EMOTION, &Actions::emote, InputAction::EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -803,7 +885,7 @@ static const InputActionData inputActionData Input::GRP_EMOTION, &Actions::emote, InputAction::EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -813,7 +895,7 @@ static const InputActionData inputActionData Input::GRP_EMOTION, &Actions::emote, InputAction::EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -823,7 +905,7 @@ static const InputActionData inputActionData Input::GRP_EMOTION, &Actions::emote, InputAction::EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -833,7 +915,7 @@ static const InputActionData inputActionData Input::GRP_EMOTION, &Actions::emote, InputAction::EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -843,7 +925,7 @@ static const InputActionData inputActionData Input::GRP_EMOTION, &Actions::emote, InputAction::EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -853,7 +935,7 @@ static const InputActionData inputActionData Input::GRP_EMOTION, &Actions::emote, InputAction::EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -863,7 +945,7 @@ static const InputActionData inputActionData Input::GRP_EMOTION, &Actions::emote, InputAction::EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -873,7 +955,7 @@ static const InputActionData inputActionData Input::GRP_EMOTION, &Actions::emote, InputAction::EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -883,7 +965,7 @@ static const InputActionData inputActionData Input::GRP_EMOTION, &Actions::emote, InputAction::EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -893,7 +975,7 @@ static const InputActionData inputActionData Input::GRP_EMOTION, &Actions::emote, InputAction::EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -903,7 +985,7 @@ static const InputActionData inputActionData Input::GRP_EMOTION, &Actions::emote, InputAction::EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -913,7 +995,7 @@ static const InputActionData inputActionData Input::GRP_EMOTION, &Actions::emote, InputAction::EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -923,7 +1005,7 @@ static const InputActionData inputActionData Input::GRP_EMOTION, &Actions::emote, InputAction::EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -933,7 +1015,7 @@ static const InputActionData inputActionData Input::GRP_EMOTION, &Actions::emote, InputAction::EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -943,7 +1025,7 @@ static const InputActionData inputActionData Input::GRP_EMOTION, &Actions::emote, InputAction::EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -953,7 +1035,7 @@ static const InputActionData inputActionData Input::GRP_EMOTION, &Actions::emote, InputAction::EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -963,7 +1045,7 @@ static const InputActionData inputActionData Input::GRP_EMOTION, &Actions::emote, InputAction::EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -973,7 +1055,7 @@ static const InputActionData inputActionData Input::GRP_EMOTION, &Actions::emote, InputAction::EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -983,7 +1065,7 @@ static const InputActionData inputActionData Input::GRP_EMOTION, &Actions::emote, InputAction::EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -993,7 +1075,7 @@ static const InputActionData inputActionData Input::GRP_EMOTION, &Actions::emote, InputAction::EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1003,7 +1085,7 @@ static const InputActionData inputActionData Input::GRP_EMOTION, &Actions::emote, InputAction::EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1013,7 +1095,7 @@ static const InputActionData inputActionData Input::GRP_EMOTION, &Actions::emote, InputAction::EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1023,7 +1105,7 @@ static const InputActionData inputActionData Input::GRP_EMOTION, &Actions::emote, InputAction::EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1033,7 +1115,7 @@ static const InputActionData inputActionData Input::GRP_EMOTION, &Actions::emote, InputAction::EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1043,7 +1125,7 @@ static const InputActionData inputActionData Input::GRP_EMOTION, &Actions::emote, InputAction::EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1053,7 +1135,7 @@ static const InputActionData inputActionData Input::GRP_EMOTION, &Actions::emote, InputAction::EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1063,7 +1145,7 @@ static const InputActionData inputActionData Input::GRP_EMOTION, &Actions::emote, InputAction::EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1073,7 +1155,7 @@ static const InputActionData inputActionData Input::GRP_EMOTION, &Actions::emote, InputAction::EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1083,7 +1165,7 @@ static const InputActionData inputActionData Input::GRP_EMOTION, &Actions::emote, InputAction::EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1093,7 +1175,7 @@ static const InputActionData inputActionData Input::GRP_EMOTION, &Actions::emote, InputAction::EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1103,7 +1185,7 @@ static const InputActionData inputActionData Input::GRP_EMOTION, &Actions::emote, InputAction::EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1113,7 +1195,7 @@ static const InputActionData inputActionData Input::GRP_EMOTION, &Actions::emote, InputAction::EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1123,7 +1205,7 @@ static const InputActionData inputActionData Input::GRP_EMOTION, &Actions::emote, InputAction::EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1133,7 +1215,7 @@ static const InputActionData inputActionData Input::GRP_EMOTION, &Actions::emote, InputAction::EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1143,7 +1225,7 @@ static const InputActionData inputActionData Input::GRP_EMOTION, &Actions::emote, InputAction::EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1153,7 +1235,7 @@ static const InputActionData inputActionData Input::GRP_EMOTION, &Actions::emote, InputAction::EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1163,7 +1245,7 @@ static const InputActionData inputActionData Input::GRP_EMOTION, &Actions::emote, InputAction::EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1173,7 +1255,7 @@ static const InputActionData inputActionData Input::GRP_EMOTION, &Actions::emote, InputAction::EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1183,7 +1265,7 @@ static const InputActionData inputActionData Input::GRP_EMOTION, &Actions::emote, InputAction::EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1193,7 +1275,7 @@ static const InputActionData inputActionData Input::GRP_EMOTION, &Actions::emote, InputAction::EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1203,7 +1285,7 @@ static const InputActionData inputActionData Input::GRP_EMOTION, &Actions::emote, InputAction::EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1213,7 +1295,7 @@ static const InputActionData inputActionData Input::GRP_EMOTION, &Actions::emote, InputAction::EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1223,7 +1305,7 @@ static const InputActionData inputActionData Input::GRP_EMOTION, &Actions::emote, InputAction::EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1233,7 +1315,7 @@ static const InputActionData inputActionData Input::GRP_EMOTION, &Actions::emote, InputAction::EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1243,7 +1325,9 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, nullptr, InputAction::NO_VALUE, 50, - InputCondition::DEFAULT | InputCondition::INGAME, + InputCondition::KEY_DOWN | + InputCondition::DEFAULT | + InputCondition::INGAME, "", UseArgs_false, Protected_true}, @@ -1253,7 +1337,9 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, nullptr, InputAction::NO_VALUE, 50, - InputCondition::DEFAULT | InputCondition::INGAME, + InputCondition::KEY_DOWN | + InputCondition::DEFAULT | + InputCondition::INGAME, "", UseArgs_false, Protected_true}, @@ -1263,7 +1349,9 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::copyEquippedToOutfit, InputAction::NO_VALUE, 50, - InputCondition::GAME | InputCondition::VALIDSPEED, + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::VALIDSPEED, "copyequippedtooutfit|itemstooutfit", UseArgs_false, Protected_true}, @@ -1273,7 +1361,7 @@ static const InputActionData inputActionData Input::GRP_OUTFIT, &Actions::outfit, InputAction::NO_VALUE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1283,7 +1371,7 @@ static const InputActionData inputActionData Input::GRP_OUTFIT, &Actions::outfit, InputAction::NO_VALUE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1293,7 +1381,7 @@ static const InputActionData inputActionData Input::GRP_OUTFIT, &Actions::outfit, InputAction::NO_VALUE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1303,7 +1391,7 @@ static const InputActionData inputActionData Input::GRP_OUTFIT, &Actions::outfit, InputAction::NO_VALUE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1313,7 +1401,7 @@ static const InputActionData inputActionData Input::GRP_OUTFIT, &Actions::outfit, InputAction::NO_VALUE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1323,7 +1411,7 @@ static const InputActionData inputActionData Input::GRP_OUTFIT, &Actions::outfit, InputAction::NO_VALUE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1333,7 +1421,7 @@ static const InputActionData inputActionData Input::GRP_OUTFIT, &Actions::outfit, InputAction::NO_VALUE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1343,7 +1431,7 @@ static const InputActionData inputActionData Input::GRP_OUTFIT, &Actions::outfit, InputAction::NO_VALUE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1353,7 +1441,7 @@ static const InputActionData inputActionData Input::GRP_OUTFIT, &Actions::outfit, InputAction::NO_VALUE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1363,7 +1451,7 @@ static const InputActionData inputActionData Input::GRP_OUTFIT, &Actions::outfit, InputAction::NO_VALUE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1373,7 +1461,7 @@ static const InputActionData inputActionData Input::GRP_OUTFIT, &Actions::outfit, InputAction::NO_VALUE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1383,7 +1471,7 @@ static const InputActionData inputActionData Input::GRP_OUTFIT, &Actions::outfit, InputAction::NO_VALUE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1393,7 +1481,7 @@ static const InputActionData inputActionData Input::GRP_OUTFIT, &Actions::outfit, InputAction::NO_VALUE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1403,7 +1491,7 @@ static const InputActionData inputActionData Input::GRP_OUTFIT, &Actions::outfit, InputAction::NO_VALUE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1413,7 +1501,7 @@ static const InputActionData inputActionData Input::GRP_OUTFIT, &Actions::outfit, InputAction::NO_VALUE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1423,7 +1511,7 @@ static const InputActionData inputActionData Input::GRP_OUTFIT, &Actions::outfit, InputAction::NO_VALUE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1433,7 +1521,7 @@ static const InputActionData inputActionData Input::GRP_OUTFIT, &Actions::outfit, InputAction::NO_VALUE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1443,7 +1531,7 @@ static const InputActionData inputActionData Input::GRP_OUTFIT, &Actions::outfit, InputAction::NO_VALUE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1453,7 +1541,7 @@ static const InputActionData inputActionData Input::GRP_OUTFIT, &Actions::outfit, InputAction::NO_VALUE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1463,7 +1551,7 @@ static const InputActionData inputActionData Input::GRP_OUTFIT, &Actions::outfit, InputAction::NO_VALUE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1473,7 +1561,7 @@ static const InputActionData inputActionData Input::GRP_OUTFIT, &Actions::outfit, InputAction::NO_VALUE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1483,7 +1571,7 @@ static const InputActionData inputActionData Input::GRP_OUTFIT, &Actions::outfit, InputAction::NO_VALUE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1493,7 +1581,7 @@ static const InputActionData inputActionData Input::GRP_OUTFIT, &Actions::outfit, InputAction::NO_VALUE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1503,7 +1591,7 @@ static const InputActionData inputActionData Input::GRP_OUTFIT, &Actions::outfit, InputAction::NO_VALUE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1513,7 +1601,7 @@ static const InputActionData inputActionData Input::GRP_OUTFIT, &Actions::outfit, InputAction::NO_VALUE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1523,7 +1611,7 @@ static const InputActionData inputActionData Input::GRP_OUTFIT, &Actions::outfit, InputAction::NO_VALUE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1533,7 +1621,7 @@ static const InputActionData inputActionData Input::GRP_OUTFIT, &Actions::outfit, InputAction::NO_VALUE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1543,7 +1631,7 @@ static const InputActionData inputActionData Input::GRP_OUTFIT, &Actions::outfit, InputAction::NO_VALUE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1553,7 +1641,7 @@ static const InputActionData inputActionData Input::GRP_OUTFIT, &Actions::outfit, InputAction::NO_VALUE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1563,7 +1651,7 @@ static const InputActionData inputActionData Input::GRP_OUTFIT, &Actions::outfit, InputAction::NO_VALUE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1573,7 +1661,7 @@ static const InputActionData inputActionData Input::GRP_OUTFIT, &Actions::outfit, InputAction::NO_VALUE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1583,7 +1671,7 @@ static const InputActionData inputActionData Input::GRP_OUTFIT, &Actions::outfit, InputAction::NO_VALUE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1593,7 +1681,7 @@ static const InputActionData inputActionData Input::GRP_OUTFIT, &Actions::outfit, InputAction::NO_VALUE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1603,7 +1691,7 @@ static const InputActionData inputActionData Input::GRP_OUTFIT, &Actions::outfit, InputAction::NO_VALUE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1613,7 +1701,7 @@ static const InputActionData inputActionData Input::GRP_OUTFIT, &Actions::outfit, InputAction::NO_VALUE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1623,7 +1711,7 @@ static const InputActionData inputActionData Input::GRP_OUTFIT, &Actions::outfit, InputAction::NO_VALUE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1633,7 +1721,7 @@ static const InputActionData inputActionData Input::GRP_OUTFIT, &Actions::outfit, InputAction::NO_VALUE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1643,7 +1731,7 @@ static const InputActionData inputActionData Input::GRP_OUTFIT, &Actions::outfit, InputAction::NO_VALUE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1653,7 +1741,7 @@ static const InputActionData inputActionData Input::GRP_OUTFIT, &Actions::outfit, InputAction::NO_VALUE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1663,7 +1751,7 @@ static const InputActionData inputActionData Input::GRP_OUTFIT, &Actions::outfit, InputAction::NO_VALUE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1673,7 +1761,7 @@ static const InputActionData inputActionData Input::GRP_OUTFIT, &Actions::outfit, InputAction::NO_VALUE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1683,7 +1771,7 @@ static const InputActionData inputActionData Input::GRP_OUTFIT, &Actions::outfit, InputAction::NO_VALUE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1693,7 +1781,7 @@ static const InputActionData inputActionData Input::GRP_OUTFIT, &Actions::outfit, InputAction::NO_VALUE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1703,7 +1791,7 @@ static const InputActionData inputActionData Input::GRP_OUTFIT, &Actions::outfit, InputAction::NO_VALUE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1713,7 +1801,7 @@ static const InputActionData inputActionData Input::GRP_OUTFIT, &Actions::outfit, InputAction::NO_VALUE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1723,7 +1811,7 @@ static const InputActionData inputActionData Input::GRP_OUTFIT, &Actions::outfit, InputAction::NO_VALUE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1733,7 +1821,7 @@ static const InputActionData inputActionData Input::GRP_OUTFIT, &Actions::outfit, InputAction::NO_VALUE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1743,7 +1831,7 @@ static const InputActionData inputActionData Input::GRP_OUTFIT, &Actions::outfit, InputAction::NO_VALUE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1753,7 +1841,7 @@ static const InputActionData inputActionData Input::GRP_MOVETOPOINT, &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1763,7 +1851,7 @@ static const InputActionData inputActionData Input::GRP_MOVETOPOINT, &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1773,7 +1861,7 @@ static const InputActionData inputActionData Input::GRP_MOVETOPOINT, &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1783,7 +1871,7 @@ static const InputActionData inputActionData Input::GRP_MOVETOPOINT, &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1793,7 +1881,7 @@ static const InputActionData inputActionData Input::GRP_MOVETOPOINT, &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1803,7 +1891,7 @@ static const InputActionData inputActionData Input::GRP_MOVETOPOINT, &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1813,7 +1901,7 @@ static const InputActionData inputActionData Input::GRP_MOVETOPOINT, &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1823,7 +1911,7 @@ static const InputActionData inputActionData Input::GRP_MOVETOPOINT, &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1833,7 +1921,7 @@ static const InputActionData inputActionData Input::GRP_MOVETOPOINT, &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1843,7 +1931,7 @@ static const InputActionData inputActionData Input::GRP_MOVETOPOINT, &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1853,7 +1941,7 @@ static const InputActionData inputActionData Input::GRP_MOVETOPOINT, &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1863,7 +1951,7 @@ static const InputActionData inputActionData Input::GRP_MOVETOPOINT, &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1873,7 +1961,7 @@ static const InputActionData inputActionData Input::GRP_MOVETOPOINT, &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1883,7 +1971,7 @@ static const InputActionData inputActionData Input::GRP_MOVETOPOINT, &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1893,7 +1981,7 @@ static const InputActionData inputActionData Input::GRP_MOVETOPOINT, &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1903,7 +1991,7 @@ static const InputActionData inputActionData Input::GRP_MOVETOPOINT, &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1913,7 +2001,7 @@ static const InputActionData inputActionData Input::GRP_MOVETOPOINT, &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1923,7 +2011,7 @@ static const InputActionData inputActionData Input::GRP_MOVETOPOINT, &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1933,7 +2021,7 @@ static const InputActionData inputActionData Input::GRP_MOVETOPOINT, &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1943,7 +2031,7 @@ static const InputActionData inputActionData Input::GRP_MOVETOPOINT, &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1953,7 +2041,7 @@ static const InputActionData inputActionData Input::GRP_MOVETOPOINT, &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1963,7 +2051,7 @@ static const InputActionData inputActionData Input::GRP_MOVETOPOINT, &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1973,7 +2061,7 @@ static const InputActionData inputActionData Input::GRP_MOVETOPOINT, &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1983,7 +2071,7 @@ static const InputActionData inputActionData Input::GRP_MOVETOPOINT, &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -1993,7 +2081,7 @@ static const InputActionData inputActionData Input::GRP_MOVETOPOINT, &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -2003,7 +2091,7 @@ static const InputActionData inputActionData Input::GRP_MOVETOPOINT, &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -2013,7 +2101,7 @@ static const InputActionData inputActionData Input::GRP_MOVETOPOINT, &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -2023,7 +2111,7 @@ static const InputActionData inputActionData Input::GRP_MOVETOPOINT, &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -2033,7 +2121,7 @@ static const InputActionData inputActionData Input::GRP_MOVETOPOINT, &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -2043,7 +2131,7 @@ static const InputActionData inputActionData Input::GRP_MOVETOPOINT, &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -2053,7 +2141,7 @@ static const InputActionData inputActionData Input::GRP_MOVETOPOINT, &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -2063,7 +2151,7 @@ static const InputActionData inputActionData Input::GRP_MOVETOPOINT, &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -2073,7 +2161,7 @@ static const InputActionData inputActionData Input::GRP_MOVETOPOINT, &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -2083,7 +2171,7 @@ static const InputActionData inputActionData Input::GRP_MOVETOPOINT, &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -2093,7 +2181,7 @@ static const InputActionData inputActionData Input::GRP_MOVETOPOINT, &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -2103,7 +2191,7 @@ static const InputActionData inputActionData Input::GRP_MOVETOPOINT, &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -2113,7 +2201,7 @@ static const InputActionData inputActionData Input::GRP_MOVETOPOINT, &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -2123,7 +2211,7 @@ static const InputActionData inputActionData Input::GRP_MOVETOPOINT, &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -2133,7 +2221,7 @@ static const InputActionData inputActionData Input::GRP_MOVETOPOINT, &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -2143,7 +2231,7 @@ static const InputActionData inputActionData Input::GRP_MOVETOPOINT, &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -2153,7 +2241,7 @@ static const InputActionData inputActionData Input::GRP_MOVETOPOINT, &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -2163,7 +2251,7 @@ static const InputActionData inputActionData Input::GRP_MOVETOPOINT, &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -2173,7 +2261,7 @@ static const InputActionData inputActionData Input::GRP_MOVETOPOINT, &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -2183,7 +2271,7 @@ static const InputActionData inputActionData Input::GRP_MOVETOPOINT, &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -2193,7 +2281,7 @@ static const InputActionData inputActionData Input::GRP_MOVETOPOINT, &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -2203,7 +2291,7 @@ static const InputActionData inputActionData Input::GRP_MOVETOPOINT, &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -2213,7 +2301,7 @@ static const InputActionData inputActionData Input::GRP_MOVETOPOINT, &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -2223,7 +2311,7 @@ static const InputActionData inputActionData Input::GRP_MOVETOPOINT, &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_true}, @@ -2233,8 +2321,10 @@ static const InputActionData inputActionData Input::GRP_DEFAULT | Input::GRP_CHAT, &Actions::toggleChat, InputAction::NO_VALUE, 50, - InputCondition::NOINPUT | InputCondition::NOAWAY - | InputCondition::NOMODAL, + InputCondition::KEY_DOWN | + InputCondition::NOINPUT | + InputCondition::NOAWAY | + InputCondition::NOMODAL, "chat", UseArgs_false, Protected_false}, @@ -2244,7 +2334,9 @@ static const InputActionData inputActionData Input::GRP_DEFAULT | Input::GRP_GUI, &Actions::scrollChatUp, InputAction::NO_VALUE, 50, - InputCondition::DEFAULT | InputCondition::INGAME, + InputCondition::KEY_DOWN | + InputCondition::DEFAULT | + InputCondition::INGAME, "chatscrollup", UseArgs_false, Protected_false}, @@ -2254,7 +2346,9 @@ static const InputActionData inputActionData Input::GRP_DEFAULT | Input::GRP_GUI, &Actions::scrollChatDown, InputAction::NO_VALUE, 50, - InputCondition::DEFAULT | InputCondition::INGAME, + InputCondition::KEY_DOWN | + InputCondition::DEFAULT | + InputCondition::INGAME, "chatscrolldown", UseArgs_false, Protected_false}, @@ -2264,7 +2358,9 @@ static const InputActionData inputActionData Input::GRP_DEFAULT | Input::GRP_GUI, &Actions::prevChatTab, InputAction::NO_VALUE, 50, - InputCondition::NOINPUT | InputCondition::INGAME, + InputCondition::KEY_DOWN | + InputCondition::NOINPUT | + InputCondition::INGAME, "prevtab", UseArgs_false, Protected_false}, @@ -2274,7 +2370,9 @@ static const InputActionData inputActionData Input::GRP_DEFAULT | Input::GRP_GUI, &Actions::nextChatTab, InputAction::NO_VALUE, 50, - InputCondition::NOINPUT | InputCondition::INGAME, + InputCondition::KEY_DOWN | + InputCondition::NOINPUT | + InputCondition::INGAME, "nexttab", UseArgs_false, Protected_false}, @@ -2284,7 +2382,9 @@ static const InputActionData inputActionData Input::GRP_DEFAULT | Input::GRP_GUI, &Actions::closeChatTab, InputAction::NO_VALUE, 50, - InputCondition::NOINPUT | InputCondition::INGAME, + InputCondition::KEY_DOWN | + InputCondition::NOINPUT | + InputCondition::INGAME, "close", UseArgs_false, Protected_false}, @@ -2294,7 +2394,9 @@ static const InputActionData inputActionData Input::GRP_CHAT | Input::GRP_GUICHAN, nullptr, InputAction::NO_VALUE, 50, - InputCondition::DEFAULT | InputCondition::INGAME, + InputCondition::KEY_DOWN | + InputCondition::DEFAULT | + InputCondition::INGAME, "", UseArgs_false, Protected_false}, @@ -2304,7 +2406,9 @@ static const InputActionData inputActionData Input::GRP_CHAT | Input::GRP_GUICHAN, nullptr, InputAction::NO_VALUE, 50, - InputCondition::DEFAULT | InputCondition::INGAME, + InputCondition::KEY_DOWN | + InputCondition::DEFAULT | + InputCondition::INGAME, "", UseArgs_false, Protected_false}, @@ -2318,7 +2422,7 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::ignoreInput, InputAction::NO_VALUE, 500, - InputCondition::DEFAULT, + InputCondition::KEY_DOWN | InputCondition::DEFAULT, "", UseArgs_false, Protected_true}, @@ -2332,31 +2436,31 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::ignoreInput, InputAction::NO_VALUE, 500, - InputCondition::DEFAULT, + InputCondition::KEY_DOWN | InputCondition::DEFAULT, "", UseArgs_false, Protected_true}, {"keyDirectUp", defaultAction(&Actions::directUp), - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "directup|turnup", UseArgs_false, Protected_false}, {"keyDirectDown", defaultAction(&Actions::directDown), - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "directdown|turndown", UseArgs_false, Protected_false}, {"keyDirectLeft", defaultAction(&Actions::directLeft), - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "directleft|turnleft", UseArgs_false, Protected_false}, {"keyDirectRight", defaultAction(&Actions::directRight), - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "directright|turnright", UseArgs_false, Protected_false}, @@ -2366,7 +2470,9 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::crazyMoves, InputAction::NO_VALUE, 50, - InputCondition::GAME | InputCondition::VALIDSPEED, + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::VALIDSPEED, "", UseArgs_false, Protected_true}, @@ -2376,8 +2482,10 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::changeCrazyMove, InputAction::NO_VALUE, 50, - InputCondition::GAME | InputCondition::VALIDSPEED - | InputCondition::EMODS, + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::VALIDSPEED | + InputCondition::EMODS, "", UseArgs_false, Protected_true}, @@ -2387,7 +2495,9 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::dropItem0, InputAction::NO_VALUE, 50, - InputCondition::GAME | InputCondition::VALIDSPEED, + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::VALIDSPEED, "drop", UseArgs_false, Protected_true}, @@ -2397,7 +2507,9 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::dropItem, InputAction::NO_VALUE, 50, - InputCondition::GAME | InputCondition::VALIDSPEED, + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::VALIDSPEED, "dropn", UseArgs_false, Protected_true}, @@ -2407,7 +2519,9 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::switchQuickDrop, InputAction::NO_VALUE, 50, - InputCondition::GAME | InputCondition::VALIDSPEED, + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::VALIDSPEED, "", UseArgs_false, Protected_true}, @@ -2417,7 +2531,9 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::heal, InputAction::NO_VALUE, 50, - InputCondition::GAME | InputCondition::VALIDSPEED, + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::VALIDSPEED, "heal", UseArgs_true, Protected_false}, @@ -2427,7 +2543,9 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::itenplz, InputAction::NO_VALUE, 50, - InputCondition::GAME | InputCondition::VALIDSPEED, + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::VALIDSPEED, "itenplz", UseArgs_false, Protected_true}, @@ -2437,8 +2555,10 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::magicAttack, InputAction::NO_VALUE, 50, - InputCondition::GAME | InputCondition::NOFOLLOW - | InputCondition::VALIDSPEED, + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::NOFOLLOW | + InputCondition::VALIDSPEED, "magicattack", UseArgs_false, Protected_false}, @@ -2448,22 +2568,28 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::changeMagicAttackType, InputAction::NO_VALUE, 50, - InputCondition::GAME | InputCondition::VALIDSPEED - | InputCondition::EMODS, + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::VALIDSPEED | + InputCondition::EMODS, "", UseArgs_false, Protected_true}, {"keySwitchPvpAttack", defaultAction(&Actions::changePvpMode), - InputCondition::GAME | InputCondition::VALIDSPEED - | InputCondition::EMODS, + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::VALIDSPEED | + InputCondition::EMODS, "", UseArgs_false, Protected_true}, {"keyInvertDirection", defaultAction(&Actions::changeMoveType), - InputCondition::GAME | InputCondition::VALIDSPEED - | InputCondition::EMODS, + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::VALIDSPEED | + InputCondition::EMODS, "", UseArgs_false, Protected_false}, @@ -2473,8 +2599,10 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::changeAttackWeaponType, InputAction::NO_VALUE, 50, - InputCondition::GAME | InputCondition::VALIDSPEED - | InputCondition::EMODS, + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::VALIDSPEED | + InputCondition::EMODS, "", UseArgs_false, Protected_true}, @@ -2484,8 +2612,10 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::changeAttackType, InputAction::NO_VALUE, 50, - InputCondition::GAME | InputCondition::VALIDSPEED - | InputCondition::EMODS, + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::VALIDSPEED | + InputCondition::EMODS, "", UseArgs_false, Protected_true}, @@ -2495,8 +2625,10 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::changeFollowMode, InputAction::NO_VALUE, 50, - InputCondition::GAME | InputCondition::VALIDSPEED - | InputCondition::EMODS, + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::VALIDSPEED | + InputCondition::EMODS, "", UseArgs_false, Protected_true}, @@ -2506,8 +2638,10 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::changeImitationMode, InputAction::NO_VALUE, 50, - InputCondition::GAME | InputCondition::VALIDSPEED - | InputCondition::EMODS, + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::VALIDSPEED | + InputCondition::EMODS, "", UseArgs_false, Protected_true}, @@ -2517,7 +2651,9 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::changeGameModifier, InputAction::NO_VALUE, 50, - InputCondition::GAME | InputCondition::VALIDSPEED, + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::VALIDSPEED, "", UseArgs_false, Protected_true}, @@ -2527,7 +2663,9 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::changeAudio, InputAction::NO_VALUE, 50, - InputCondition::GAME | InputCondition::VALIDSPEED, + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::VALIDSPEED, "audio", UseArgs_false, Protected_true}, @@ -2537,7 +2675,9 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::away, InputAction::NO_VALUE, 50, - InputCondition::GAME | InputCondition::VALIDSPEED, + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::VALIDSPEED, "", UseArgs_false, Protected_false}, @@ -2547,8 +2687,11 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::mouseClick, InputAction::NO_VALUE, 50, - InputCondition::NOINPUT | InputCondition::NOAWAY - | InputCondition::NOMODAL | InputCondition::INGAME, + InputCondition::KEY_DOWN | + InputCondition::NOINPUT | + InputCondition::NOAWAY | + InputCondition::NOMODAL | + InputCondition::INGAME, "rightclick", UseArgs_false, Protected_false}, @@ -2558,8 +2701,10 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::camera, InputAction::NO_VALUE, 50, - InputCondition::GAME | InputCondition::VALIDSPEED - | InputCondition::EMODS, + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::VALIDSPEED | + InputCondition::EMODS, "", UseArgs_false, Protected_false}, @@ -2569,7 +2714,7 @@ static const InputActionData inputActionData 0, nullptr, InputAction::NO_VALUE, 50, - InputCondition::DEFAULT, + InputCondition::KEY_DOWN | InputCondition::DEFAULT, "", UseArgs_false, Protected_false}, @@ -2579,7 +2724,7 @@ static const InputActionData inputActionData Input::GRP_GUICHAN, nullptr, InputAction::NO_VALUE, 50, - InputCondition::DEFAULT, + InputCondition::KEY_DOWN | InputCondition::DEFAULT, "", UseArgs_false, Protected_false}, @@ -2589,7 +2734,7 @@ static const InputActionData inputActionData Input::GRP_GUICHAN, nullptr, InputAction::NO_VALUE, 50, - InputCondition::DEFAULT, + InputCondition::KEY_DOWN | InputCondition::DEFAULT, "", UseArgs_false, Protected_false}, @@ -2599,7 +2744,7 @@ static const InputActionData inputActionData Input::GRP_GUICHAN, nullptr, InputAction::NO_VALUE, 50, - InputCondition::DEFAULT, + InputCondition::KEY_DOWN | InputCondition::DEFAULT, "", UseArgs_false, Protected_false}, @@ -2609,7 +2754,7 @@ static const InputActionData inputActionData Input::GRP_GUICHAN, nullptr, InputAction::NO_VALUE, 50, - InputCondition::DEFAULT, + InputCondition::KEY_DOWN | InputCondition::DEFAULT, "", UseArgs_false, Protected_false}, @@ -2619,7 +2764,7 @@ static const InputActionData inputActionData Input::GRP_GUICHAN, nullptr, InputAction::NO_VALUE, 50, - InputCondition::DEFAULT, + InputCondition::KEY_DOWN | InputCondition::DEFAULT, "", UseArgs_false, Protected_false}, @@ -2629,7 +2774,7 @@ static const InputActionData inputActionData Input::GRP_GUICHAN, nullptr, InputAction::NO_VALUE, 50, - InputCondition::DEFAULT, + InputCondition::KEY_DOWN | InputCondition::DEFAULT, "", UseArgs_false, Protected_false}, @@ -2643,7 +2788,7 @@ static const InputActionData inputActionData Input::GRP_GUICHAN, nullptr, InputAction::NO_VALUE, 50, - InputCondition::DEFAULT, + InputCondition::KEY_DOWN | InputCondition::DEFAULT, "", UseArgs_false, Protected_false}, @@ -2653,7 +2798,7 @@ static const InputActionData inputActionData Input::GRP_GUICHAN, nullptr, InputAction::NO_VALUE, 50, - InputCondition::DEFAULT, + InputCondition::KEY_DOWN | InputCondition::DEFAULT, "", UseArgs_false, Protected_false}, @@ -2663,7 +2808,7 @@ static const InputActionData inputActionData Input::GRP_GUICHAN, nullptr, InputAction::NO_VALUE, 50, - InputCondition::DEFAULT, + InputCondition::KEY_DOWN | InputCondition::DEFAULT, "", UseArgs_false, Protected_false}, @@ -2673,7 +2818,7 @@ static const InputActionData inputActionData Input::GRP_GUICHAN, nullptr, InputAction::NO_VALUE, 50, - InputCondition::DEFAULT, + InputCondition::KEY_DOWN | InputCondition::DEFAULT, "", UseArgs_false, Protected_false}, @@ -2683,7 +2828,7 @@ static const InputActionData inputActionData Input::GRP_GUICHAN, nullptr, InputAction::NO_VALUE, 50, - InputCondition::DEFAULT, + InputCondition::KEY_DOWN | InputCondition::DEFAULT, "", UseArgs_false, Protected_false}, @@ -2693,7 +2838,7 @@ static const InputActionData inputActionData Input::GRP_GUICHAN, nullptr, InputAction::NO_VALUE, 50, - InputCondition::DEFAULT, + InputCondition::KEY_DOWN | InputCondition::DEFAULT, "", UseArgs_false, Protected_false}, @@ -2703,7 +2848,7 @@ static const InputActionData inputActionData Input::GRP_GUICHAN, nullptr, InputAction::NO_VALUE, 50, - InputCondition::DEFAULT, + InputCondition::KEY_DOWN | InputCondition::DEFAULT, "", UseArgs_false, Protected_false}, @@ -2713,7 +2858,7 @@ static const InputActionData inputActionData Input::GRP_GUICHAN, nullptr, InputAction::NO_VALUE, 50, - InputCondition::DEFAULT, + InputCondition::KEY_DOWN | InputCondition::DEFAULT, "", UseArgs_false, Protected_false}, @@ -2723,7 +2868,7 @@ static const InputActionData inputActionData Input::GRP_GUICHAN, nullptr, InputAction::NO_VALUE, 50, - InputCondition::DEFAULT, + InputCondition::KEY_DOWN | InputCondition::DEFAULT, "", UseArgs_false, Protected_false}, @@ -2733,7 +2878,7 @@ static const InputActionData inputActionData Input::GRP_GUICHAN, nullptr, InputAction::NO_VALUE, 50, - InputCondition::DEFAULT, + InputCondition::KEY_DOWN | InputCondition::DEFAULT, "", UseArgs_false, Protected_false}, @@ -2743,25 +2888,29 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::safeVideoMode, InputAction::NO_VALUE, 50, - InputCondition::DEFAULT, + InputCondition::KEY_DOWN | InputCondition::DEFAULT, "", UseArgs_false, Protected_true}, {"keyStopSit", defaultAction(&Actions::stopSit), - InputCondition::DEFAULT | InputCondition::INGAME, + InputCondition::KEY_DOWN | + InputCondition::DEFAULT | + InputCondition::INGAME, "sit2", UseArgs_false, Protected_false}, {"keyShowKeyboard", defaultAction(&Actions::showKeyboard), - InputCondition::DEFAULT, + InputCondition::KEY_DOWN | InputCondition::DEFAULT, "showkeyboard", UseArgs_false, Protected_false}, {"keyShowWindows", defaultAction(&Actions::showWindows), - InputCondition::DEFAULT | InputCondition::INGAME, + InputCondition::KEY_DOWN | + InputCondition::DEFAULT | + InputCondition::INGAME, "showwindows", UseArgs_false, Protected_false}, @@ -2771,13 +2920,15 @@ static const InputActionData inputActionData Input::GRP_CHAT, nullptr, InputAction::NO_VALUE, 50, - InputCondition::DEFAULT | InputCondition::INGAME, + InputCondition::KEY_DOWN | + InputCondition::DEFAULT | + InputCondition::INGAME, "", UseArgs_false, Protected_false}, {"keyMoveForward", defaultAction(&Actions::moveForward), - InputCondition::ARROWKEYS, + InputCondition::KEY_DOWN | InputCondition::ARROWKEYS, "", UseArgs_false, Protected_false}, @@ -2787,7 +2938,7 @@ static const InputActionData inputActionData Input::GRP_GUICHAN, nullptr, InputAction::NO_VALUE, 50, - InputCondition::DEFAULT, + InputCondition::KEY_DOWN | InputCondition::DEFAULT, "", UseArgs_false, Protected_false}, @@ -2797,7 +2948,7 @@ static const InputActionData inputActionData Input::GRP_GUICHAN, nullptr, InputAction::NO_VALUE, 50, - InputCondition::DEFAULT, + InputCondition::KEY_DOWN | InputCondition::DEFAULT, "", UseArgs_false, Protected_false}, @@ -2807,7 +2958,7 @@ static const InputActionData inputActionData Input::GRP_GUICHAN, nullptr, InputAction::NO_VALUE, 50, - InputCondition::DEFAULT, + InputCondition::KEY_DOWN | InputCondition::DEFAULT, "", UseArgs_false, Protected_false}, @@ -2817,7 +2968,7 @@ static const InputActionData inputActionData Input::GRP_GUICHAN, nullptr, InputAction::NO_VALUE, 50, - InputCondition::DEFAULT, + InputCondition::KEY_DOWN | InputCondition::DEFAULT, "", UseArgs_false, Protected_false}, @@ -2827,7 +2978,7 @@ static const InputActionData inputActionData Input::GRP_GUICHAN, nullptr, InputAction::NO_VALUE, 50, - InputCondition::DEFAULT, + InputCondition::KEY_DOWN | InputCondition::DEFAULT, "", UseArgs_false, Protected_false}, @@ -2837,7 +2988,7 @@ static const InputActionData inputActionData Input::GRP_GUICHAN, nullptr, InputAction::NO_VALUE, 50, - InputCondition::DEFAULT, + InputCondition::KEY_DOWN | InputCondition::DEFAULT, "", UseArgs_false, Protected_false}, @@ -2847,7 +2998,7 @@ static const InputActionData inputActionData Input::GRP_GUICHAN, nullptr, InputAction::NO_VALUE, 50, - InputCondition::DEFAULT, + InputCondition::KEY_DOWN | InputCondition::DEFAULT, "", UseArgs_false, Protected_false}, @@ -2857,7 +3008,7 @@ static const InputActionData inputActionData Input::GRP_GUICHAN, nullptr, InputAction::NO_VALUE, 50, - InputCondition::DEFAULT, + InputCondition::KEY_DOWN | InputCondition::DEFAULT, "", UseArgs_false, Protected_false}, @@ -2867,7 +3018,7 @@ static const InputActionData inputActionData Input::GRP_GUICHAN, nullptr, InputAction::NO_VALUE, 50, - InputCondition::DEFAULT, + InputCondition::KEY_DOWN | InputCondition::DEFAULT, "", UseArgs_false, Protected_false}, @@ -2877,7 +3028,7 @@ static const InputActionData inputActionData Input::GRP_GUICHAN, nullptr, InputAction::NO_VALUE, 50, - InputCondition::DEFAULT, + InputCondition::KEY_DOWN | InputCondition::DEFAULT, "", UseArgs_false, Protected_false}, @@ -2887,7 +3038,7 @@ static const InputActionData inputActionData Input::GRP_GUICHAN, nullptr, InputAction::NO_VALUE, 50, - InputCondition::DEFAULT, + InputCondition::KEY_DOWN | InputCondition::DEFAULT, "", UseArgs_false, Protected_false}, @@ -2897,7 +3048,9 @@ static const InputActionData inputActionData Input::GRP_DEFAULT | Input::GRP_GUI, &Actions::prevShortcutsTab, InputAction::NO_VALUE, 50, - InputCondition::NOINPUT | InputCondition::INGAME, + InputCondition::KEY_DOWN | + InputCondition::NOINPUT | + InputCondition::INGAME, "shortcutprevtab", UseArgs_false, Protected_false}, @@ -2907,7 +3060,9 @@ static const InputActionData inputActionData Input::GRP_DEFAULT | Input::GRP_GUI, &Actions::nextShortcutsTab, InputAction::NO_VALUE, 50, - InputCondition::NOINPUT | InputCondition::INGAME, + InputCondition::KEY_DOWN | + InputCondition::NOINPUT | + InputCondition::INGAME, "shortcutnexttab", UseArgs_false, Protected_false}, @@ -2917,7 +3072,9 @@ static const InputActionData inputActionData Input::GRP_DEFAULT | Input::GRP_GUI, &Actions::prevCommandsTab, InputAction::NO_VALUE, 50, - InputCondition::NOINPUT | InputCondition::INGAME, + InputCondition::KEY_DOWN | + InputCondition::NOINPUT | + InputCondition::INGAME, "commandsprevtab", UseArgs_false, Protected_false}, @@ -2927,13 +3084,17 @@ static const InputActionData inputActionData Input::GRP_DEFAULT | Input::GRP_GUI, &Actions::nextCommandsTab, InputAction::NO_VALUE, 50, - InputCondition::NOINPUT | InputCondition::INGAME, + InputCondition::KEY_DOWN | + InputCondition::NOINPUT | + InputCondition::INGAME, "commandsnexttab", UseArgs_false, Protected_false}, {"keyOpenTrade", defaultAction(&Actions::openTrade), - InputCondition::GAME | InputCondition::NOTARGET, + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::NOTARGET, "trade", UseArgs_false, Protected_false}, @@ -2943,7 +3104,7 @@ static const InputActionData inputActionData Input::GRP_GUICHAN | Input::GRP_CHAT, nullptr, InputAction::NO_VALUE, 50, - InputCondition::DEFAULT, + InputCondition::KEY_DOWN | InputCondition::DEFAULT, "", UseArgs_false, Protected_false}, @@ -2953,7 +3114,7 @@ static const InputActionData inputActionData Input::GRP_GUICHAN | Input::GRP_CHAT, nullptr, InputAction::NO_VALUE, 50, - InputCondition::DEFAULT, + InputCondition::KEY_DOWN | InputCondition::DEFAULT, "", UseArgs_false, Protected_false}, @@ -2963,7 +3124,7 @@ static const InputActionData inputActionData Input::GRP_GUICHAN | Input::GRP_CHAT, nullptr, InputAction::NO_VALUE, 50, - InputCondition::DEFAULT, + InputCondition::KEY_DOWN | InputCondition::DEFAULT, "", UseArgs_false, Protected_false}, @@ -2973,7 +3134,7 @@ static const InputActionData inputActionData Input::GRP_GUICHAN | Input::GRP_CHAT, nullptr, InputAction::NO_VALUE, 50, - InputCondition::DEFAULT, + InputCondition::KEY_DOWN | InputCondition::DEFAULT, "", UseArgs_false, Protected_false}, @@ -2983,7 +3144,7 @@ static const InputActionData inputActionData Input::GRP_GUICHAN | Input::GRP_CHAT, nullptr, InputAction::NO_VALUE, 50, - InputCondition::DEFAULT, + InputCondition::KEY_DOWN | InputCondition::DEFAULT, "", UseArgs_false, Protected_false}, @@ -2993,7 +3154,7 @@ static const InputActionData inputActionData Input::GRP_GUICHAN | Input::GRP_CHAT, nullptr, InputAction::NO_VALUE, 50, - InputCondition::DEFAULT, + InputCondition::KEY_DOWN | InputCondition::DEFAULT, "", UseArgs_false, Protected_false}, @@ -3003,7 +3164,7 @@ static const InputActionData inputActionData Input::GRP_GUICHAN | Input::GRP_CHAT, nullptr, InputAction::NO_VALUE, 50, - InputCondition::DEFAULT, + InputCondition::KEY_DOWN | InputCondition::DEFAULT, "", UseArgs_false, Protected_false}, @@ -3013,7 +3174,7 @@ static const InputActionData inputActionData Input::GRP_GUICHAN | Input::GRP_CHAT, nullptr, InputAction::NO_VALUE, 50, - InputCondition::DEFAULT, + InputCondition::KEY_DOWN | InputCondition::DEFAULT, "", UseArgs_false, Protected_false}, @@ -3023,7 +3184,7 @@ static const InputActionData inputActionData Input::GRP_GUICHAN | Input::GRP_CHAT, nullptr, InputAction::NO_VALUE, 50, - InputCondition::DEFAULT, + InputCondition::KEY_DOWN | InputCondition::DEFAULT, "", UseArgs_false, Protected_false}, @@ -3033,7 +3194,7 @@ static const InputActionData inputActionData Input::GRP_GUICHAN | Input::GRP_CHAT, nullptr, InputAction::NO_VALUE, 50, - InputCondition::DEFAULT, + InputCondition::KEY_DOWN | InputCondition::DEFAULT, "", UseArgs_false, Protected_false}, @@ -3043,7 +3204,7 @@ static const InputActionData inputActionData Input::GRP_GUICHAN | Input::GRP_CHAT, nullptr, InputAction::NO_VALUE, 50, - InputCondition::DEFAULT, + InputCondition::KEY_DOWN | InputCondition::DEFAULT, "", UseArgs_false, Protected_false}, @@ -3053,7 +3214,7 @@ static const InputActionData inputActionData Input::GRP_GUICHAN | Input::GRP_CHAT, nullptr, InputAction::NO_VALUE, 50, - InputCondition::DEFAULT, + InputCondition::KEY_DOWN | InputCondition::DEFAULT, "", UseArgs_false, Protected_false}, @@ -3063,7 +3224,7 @@ static const InputActionData inputActionData Input::GRP_DEFAULT | Input::GRP_GUI, &Actions::aboutWindowShow, InputAction::NO_VALUE, 50, - InputCondition::SHORTCUT0, + InputCondition::KEY_DOWN | InputCondition::SHORTCUT0, "about", UseArgs_false, Protected_false}, @@ -3073,7 +3234,7 @@ static const InputActionData inputActionData Input::GRP_DEFAULT | Input::GRP_GUI, &Actions::updaterWindowShow, InputAction::NO_VALUE, 50, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "updater", UseArgs_false, Protected_false}, @@ -3083,8 +3244,10 @@ static const InputActionData inputActionData Input::GRP_DEFAULT | Input::GRP_REPEAT, &Actions::targetClosestMonster, InputAction::NO_VALUE, 50, - InputCondition::GAME | InputCondition::NOTARGET - | InputCondition::VALIDSPEED, + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::NOTARGET | + InputCondition::VALIDSPEED, "targetclosestmonster", UseArgs_false, Protected_false}, @@ -3094,7 +3257,7 @@ static const InputActionData inputActionData Input::GRP_DEFAULT | Input::GRP_GUI, &Actions::closeAllChatTabs, InputAction::NO_VALUE, 50, - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "closeall", UseArgs_false, Protected_true}, @@ -3104,7 +3267,7 @@ static const InputActionData inputActionData Input::GRP_DEFAULT | Input::GRP_GUI, &Actions::ignoreAllWhispers, InputAction::NO_VALUE, 50, - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "ignoreallwhispers", UseArgs_false, Protected_true}, @@ -3114,386 +3277,388 @@ static const InputActionData inputActionData Input::GRP_DEFAULT | Input::GRP_GUI, &Actions::chatAnnounce, InputAction::NO_VALUE, 50, - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "announce", UseArgs_true, Protected_true}, {"keyIpcToggle", defaultAction(&Actions::ipcToggle), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "ipctoggle", UseArgs_false, Protected_true}, {"keyWhere", defaultAction(&Actions::where), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "where", UseArgs_false, Protected_false}, {"keyWho", defaultAction(&Actions::who), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "who", UseArgs_false, Protected_false}, {"keyWhisper", defaultAction(&Actions::msg), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "w|whisper|msg", UseArgs_true, Protected_true}, {"keyQuery", defaultAction(&Actions::query), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "q|query|j|join", UseArgs_true, Protected_false}, {"keyClearChatTab", defaultAction(&Actions::clearChatTab), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "clear", UseArgs_false, Protected_false}, {"keyIgnore", defaultAction(&Actions::chatIgnore), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "ignore", UseArgs_true, Protected_true}, {"keyUnignore", defaultAction(&Actions::chatUnignore), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "unignore", UseArgs_true, Protected_true}, {"keyFriend", defaultAction(&Actions::chatFriend), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "friend|befriend", UseArgs_true, Protected_true}, {"keyDisregard", defaultAction(&Actions::chatDisregard), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "disregard", UseArgs_true, Protected_true}, {"keyNeutral", defaultAction(&Actions::chatNeutral), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "neutral", UseArgs_true, Protected_true}, {"keyBlacklist", defaultAction(&Actions::chatBlackList), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "blacklist", UseArgs_true, Protected_true}, {"keyEnemy", defaultAction(&Actions::chatEnemy), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "enemy", UseArgs_true, Protected_true}, {"keyErase", defaultAction(&Actions::chatErase), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "erase", UseArgs_true, Protected_true}, {"keyCleanGraphics", defaultAction(&Actions::cleanGraphics), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "cleangraphics", UseArgs_false, Protected_false}, {"keyCleanFonts", defaultAction(&Actions::cleanFonts), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "cleanfonts", UseArgs_false, Protected_false}, {"keyCreateParty", defaultAction(&Actions::createParty), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "createparty", UseArgs_true, Protected_true}, {"keyCreateGuild", defaultAction(&Actions::createGuild), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "createguild", UseArgs_true, Protected_true}, {"keyParty", defaultAction(&Actions::party), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "party", UseArgs_true, Protected_true}, {"keyMe", defaultAction(&Actions::me), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "me", UseArgs_true, Protected_true}, {"keyToggle", defaultAction(&Actions::toggle), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "toggle", UseArgs_false, Protected_false}, {"keyPresent", defaultAction(&Actions::present), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "present", UseArgs_false, Protected_false}, {"keyPrintAll", defaultAction(&Actions::printAll), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "all", UseArgs_false, Protected_true}, {"keyMove", defaultAction(&Actions::move), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "move", UseArgs_true, Protected_false}, {"keySetTarget", defaultAction(&Actions::setTarget), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "target", UseArgs_true, Protected_false}, {"keyAttackHuman", defaultAction(&Actions::attackHuman), - InputCondition::GAME | InputCondition::NOFOLLOW - | InputCondition::VALIDSPEED, + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::NOFOLLOW | + InputCondition::VALIDSPEED, "atkhuman", UseArgs_false, Protected_false}, {"keyOutfit", defaultAction(&Actions::commandOutfit), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "outfit", UseArgs_true, Protected_true}, {"keyEmote", defaultAction(&Actions::commandEmote), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "emote", UseArgs_true, Protected_false}, {"keyEmotePet", defaultAction(&Actions::commandEmotePet), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "emotepet", UseArgs_true, Protected_false}, {"keyAwayMessage", defaultAction(&Actions::awayMessage), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "away", UseArgs_true, Protected_true}, {"keyPseudoAway", defaultAction(&Actions::pseudoAway), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "pseudoaway", UseArgs_true, Protected_true}, {"keyFollow", defaultAction(&Actions::follow), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "follow", UseArgs_true, Protected_false}, {"keyNavigate", defaultAction(&Actions::navigate), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "navigate", UseArgs_true, Protected_false}, {"keyImitation", defaultAction(&Actions::imitation), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "imitation", UseArgs_true, Protected_false}, {"keySendMail", defaultAction(&Actions::sendMail), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "sendmail|mailsend|mailto", UseArgs_true, Protected_true}, {"keyTradeCommand", defaultAction(&Actions::trade), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "trade", UseArgs_true, Protected_false}, {"keyPriceLoad", defaultAction(&Actions::priceLoad), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "priceload", UseArgs_false, Protected_true}, {"keyPriceSave", defaultAction(&Actions::priceSave), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "pricesave", UseArgs_false, Protected_true}, {"keyCacheInfo", defaultAction(&Actions::cacheInfo), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "cacheinfo", UseArgs_false, Protected_true}, {"keyDisconnect", defaultAction(&Actions::disconnect), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "disconnect", UseArgs_false, Protected_true}, {"keyUndress", defaultAction(&Actions::undress), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "undress", UseArgs_true, Protected_false}, {"keyDirs", defaultAction(&Actions::dirs), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "dirs", UseArgs_false, Protected_false}, {"keyInfo", defaultAction(&Actions::info), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "info", UseArgs_false, Protected_false}, {"keyWait", defaultAction(&Actions::wait), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "wait", UseArgs_true, Protected_true}, {"keyUptime", defaultAction(&Actions::uptime), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "uptime", UseArgs_false, Protected_false}, {"keyAddPriorityAttack", defaultAction(&Actions::addPriorityAttack), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "addpriorityattack", UseArgs_true, Protected_true}, {"keyAddAttack", defaultAction(&Actions::addAttack), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "addattack", UseArgs_true, Protected_true}, {"keyRemoveAttack", defaultAction(&Actions::removeAttack), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "removeattack|removeignoreattack", UseArgs_true, Protected_true}, {"keyAddIgnoreAttack", defaultAction(&Actions::addIgnoreAttack), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "addignoreattack", UseArgs_true, Protected_true}, {"keyDump", defaultAction(&Actions::dump), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "dump", UseArgs_false, Protected_true}, {"keyServerIgnoreAll", defaultAction(&Actions::serverIgnoreAll), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "serverignoreall", UseArgs_false, Protected_true}, {"keyServerUnIgnoreAll", defaultAction(&Actions::serverUnIgnoreAll), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "serverunignoreall", UseArgs_false, Protected_true}, {"keySetDrop", defaultAction(&Actions::setDrop), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "setdrop", UseArgs_true, Protected_false}, {"keyError", defaultAction(&Actions::error), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "error", UseArgs_false, Protected_true}, {"keyDumpg", defaultAction(&Actions::dumpGraphics), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "dumpg", UseArgs_false, Protected_true}, {"keyDumpe", defaultAction(&Actions::dumpEnvironment), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "dumpe", UseArgs_false, Protected_true}, {"keyDumpt", defaultAction(&Actions::dumpTests), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "dumpt", UseArgs_false, Protected_true}, {"keyDumpOGL", defaultAction(&Actions::dumpOGL), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "dumpogl", UseArgs_false, Protected_true}, {"keyDumpGL", defaultAction(&Actions::dumpGL), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "dumpgl", UseArgs_false, Protected_true}, {"keyDumpMods", defaultAction(&Actions::dumpMods), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "dumpMods", UseArgs_false, Protected_false}, {"keyUrl", defaultAction(&Actions::url), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "url", UseArgs_true, Protected_true}, {"keyOpenUrl", defaultAction(&Actions::openUrl), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "open", UseArgs_true, Protected_true}, {"keyExecute", defaultAction(&Actions::execute), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "execute", UseArgs_true, Protected_true}, @@ -3507,7 +3672,7 @@ static const InputActionData inputActionData nullptr, #endif // defined USE_OPENGL && defined DEBUG_SDLFONT InputAction::NO_VALUE, 50, - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, #if defined USE_OPENGL && defined DEBUG_SDLFONT "testsdlfont", #else // defined USE_OPENGL && defined DEBUG_SDLFONT @@ -3517,103 +3682,105 @@ static const InputActionData inputActionData Protected_true}, {"keyEnableHightlight", defaultAction(&Actions::enableHighlight), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "enablehighlight", UseArgs_false, Protected_true}, {"keyDisableHightlight", defaultAction(&Actions::disableHighlight), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "disablehighlight", UseArgs_false, Protected_true}, {"keyDontRemoveName", defaultAction(&Actions::dontRemoveName), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "dontremovename", UseArgs_false, Protected_true}, {"keyRemoveName", defaultAction(&Actions::removeName), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "removename", UseArgs_false, Protected_true}, {"keyDisableAway", defaultAction(&Actions::disableAway), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "disableaway", UseArgs_false, Protected_true}, {"keyEnableAway", defaultAction(&Actions::enableAway), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "enableaway", UseArgs_false, Protected_true}, {"keyTestParticle", defaultAction(&Actions::testParticle), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "testparticle", UseArgs_true, Protected_false}, {"keyCreateItems", defaultAction(&Actions::createItems), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "createitems", UseArgs_false, Protected_false}, {"keyTalkRaw", defaultAction(&Actions::talkRaw), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "talkraw", UseArgs_true, Protected_true}, {"keyTalkPet", defaultAction(&Actions::talkPet), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "talkpet", UseArgs_true, Protected_true}, {"keyUploadConfig", defaultAction(&Actions::uploadConfig), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "uploadconfig", UseArgs_false, Protected_true}, {"keyUploadServerConfig", defaultAction(&Actions::uploadServerConfig), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "uploadserverconfig", UseArgs_false, Protected_true}, {"keyUploadLog", defaultAction(&Actions::uploadLog), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "uploadlog", UseArgs_false, Protected_true}, {"keyGm", defaultAction(&Actions::gm), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "gm", UseArgs_true, Protected_true}, {"keyHack", defaultAction(&Actions::hack), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "hack", UseArgs_true, Protected_true}, {"keyDebugSpawn", defaultAction(&Actions::debugSpawn), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "debugspawn", UseArgs_true, Protected_true}, {"keyPetSmilie", defaultAction(nullptr), - InputCondition::DEFAULT | InputCondition::INGAME, + InputCondition::KEY_DOWN | + InputCondition::DEFAULT | + InputCondition::INGAME, "", UseArgs_false, Protected_false}, @@ -3623,7 +3790,7 @@ static const InputActionData inputActionData Input::GRP_PET_EMOTION, &Actions::petEmote, InputAction::PET_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -3633,7 +3800,7 @@ static const InputActionData inputActionData Input::GRP_PET_EMOTION, &Actions::petEmote, InputAction::PET_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -3643,7 +3810,7 @@ static const InputActionData inputActionData Input::GRP_PET_EMOTION, &Actions::petEmote, InputAction::PET_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -3653,7 +3820,7 @@ static const InputActionData inputActionData Input::GRP_PET_EMOTION, &Actions::petEmote, InputAction::PET_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -3663,7 +3830,7 @@ static const InputActionData inputActionData Input::GRP_PET_EMOTION, &Actions::petEmote, InputAction::PET_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -3673,7 +3840,7 @@ static const InputActionData inputActionData Input::GRP_PET_EMOTION, &Actions::petEmote, InputAction::PET_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -3683,7 +3850,7 @@ static const InputActionData inputActionData Input::GRP_PET_EMOTION, &Actions::petEmote, InputAction::PET_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -3693,7 +3860,7 @@ static const InputActionData inputActionData Input::GRP_PET_EMOTION, &Actions::petEmote, InputAction::PET_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -3703,7 +3870,7 @@ static const InputActionData inputActionData Input::GRP_PET_EMOTION, &Actions::petEmote, InputAction::PET_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -3713,7 +3880,7 @@ static const InputActionData inputActionData Input::GRP_PET_EMOTION, &Actions::petEmote, InputAction::PET_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -3723,7 +3890,7 @@ static const InputActionData inputActionData Input::GRP_PET_EMOTION, &Actions::petEmote, InputAction::PET_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -3733,7 +3900,7 @@ static const InputActionData inputActionData Input::GRP_PET_EMOTION, &Actions::petEmote, InputAction::PET_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -3743,7 +3910,7 @@ static const InputActionData inputActionData Input::GRP_PET_EMOTION, &Actions::petEmote, InputAction::PET_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -3753,7 +3920,7 @@ static const InputActionData inputActionData Input::GRP_PET_EMOTION, &Actions::petEmote, InputAction::PET_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -3763,7 +3930,7 @@ static const InputActionData inputActionData Input::GRP_PET_EMOTION, &Actions::petEmote, InputAction::PET_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -3773,7 +3940,7 @@ static const InputActionData inputActionData Input::GRP_PET_EMOTION, &Actions::petEmote, InputAction::PET_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -3783,7 +3950,7 @@ static const InputActionData inputActionData Input::GRP_PET_EMOTION, &Actions::petEmote, InputAction::PET_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -3793,7 +3960,7 @@ static const InputActionData inputActionData Input::GRP_PET_EMOTION, &Actions::petEmote, InputAction::PET_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -3803,7 +3970,7 @@ static const InputActionData inputActionData Input::GRP_PET_EMOTION, &Actions::petEmote, InputAction::PET_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -3813,7 +3980,7 @@ static const InputActionData inputActionData Input::GRP_PET_EMOTION, &Actions::petEmote, InputAction::PET_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -3823,7 +3990,7 @@ static const InputActionData inputActionData Input::GRP_PET_EMOTION, &Actions::petEmote, InputAction::PET_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -3833,7 +4000,7 @@ static const InputActionData inputActionData Input::GRP_PET_EMOTION, &Actions::petEmote, InputAction::PET_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -3843,7 +4010,7 @@ static const InputActionData inputActionData Input::GRP_PET_EMOTION, &Actions::petEmote, InputAction::PET_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -3853,7 +4020,7 @@ static const InputActionData inputActionData Input::GRP_PET_EMOTION, &Actions::petEmote, InputAction::PET_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -3863,7 +4030,7 @@ static const InputActionData inputActionData Input::GRP_PET_EMOTION, &Actions::petEmote, InputAction::PET_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -3873,7 +4040,7 @@ static const InputActionData inputActionData Input::GRP_PET_EMOTION, &Actions::petEmote, InputAction::PET_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -3883,7 +4050,7 @@ static const InputActionData inputActionData Input::GRP_PET_EMOTION, &Actions::petEmote, InputAction::PET_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -3893,7 +4060,7 @@ static const InputActionData inputActionData Input::GRP_PET_EMOTION, &Actions::petEmote, InputAction::PET_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -3903,7 +4070,7 @@ static const InputActionData inputActionData Input::GRP_PET_EMOTION, &Actions::petEmote, InputAction::PET_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -3913,7 +4080,7 @@ static const InputActionData inputActionData Input::GRP_PET_EMOTION, &Actions::petEmote, InputAction::PET_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -3923,7 +4090,7 @@ static const InputActionData inputActionData Input::GRP_PET_EMOTION, &Actions::petEmote, InputAction::PET_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -3933,7 +4100,7 @@ static const InputActionData inputActionData Input::GRP_PET_EMOTION, &Actions::petEmote, InputAction::PET_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -3943,7 +4110,7 @@ static const InputActionData inputActionData Input::GRP_PET_EMOTION, &Actions::petEmote, InputAction::PET_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -3953,7 +4120,7 @@ static const InputActionData inputActionData Input::GRP_PET_EMOTION, &Actions::petEmote, InputAction::PET_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -3963,7 +4130,7 @@ static const InputActionData inputActionData Input::GRP_PET_EMOTION, &Actions::petEmote, InputAction::PET_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -3973,7 +4140,7 @@ static const InputActionData inputActionData Input::GRP_PET_EMOTION, &Actions::petEmote, InputAction::PET_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -3983,7 +4150,7 @@ static const InputActionData inputActionData Input::GRP_PET_EMOTION, &Actions::petEmote, InputAction::PET_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -3993,7 +4160,7 @@ static const InputActionData inputActionData Input::GRP_PET_EMOTION, &Actions::petEmote, InputAction::PET_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -4003,7 +4170,7 @@ static const InputActionData inputActionData Input::GRP_PET_EMOTION, &Actions::petEmote, InputAction::PET_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -4013,7 +4180,7 @@ static const InputActionData inputActionData Input::GRP_PET_EMOTION, &Actions::petEmote, InputAction::PET_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -4023,7 +4190,7 @@ static const InputActionData inputActionData Input::GRP_PET_EMOTION, &Actions::petEmote, InputAction::PET_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -4033,7 +4200,7 @@ static const InputActionData inputActionData Input::GRP_PET_EMOTION, &Actions::petEmote, InputAction::PET_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -4043,7 +4210,7 @@ static const InputActionData inputActionData Input::GRP_PET_EMOTION, &Actions::petEmote, InputAction::PET_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -4053,7 +4220,7 @@ static const InputActionData inputActionData Input::GRP_PET_EMOTION, &Actions::petEmote, InputAction::PET_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -4063,7 +4230,7 @@ static const InputActionData inputActionData Input::GRP_PET_EMOTION, &Actions::petEmote, InputAction::PET_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -4073,7 +4240,7 @@ static const InputActionData inputActionData Input::GRP_PET_EMOTION, &Actions::petEmote, InputAction::PET_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -4083,7 +4250,7 @@ static const InputActionData inputActionData Input::GRP_PET_EMOTION, &Actions::petEmote, InputAction::PET_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -4093,13 +4260,13 @@ static const InputActionData inputActionData Input::GRP_PET_EMOTION, &Actions::petEmote, InputAction::PET_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, {"keyCatchPet", defaultAction(&Actions::catchPet), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "catchpet|catch|taming", UseArgs_true, Protected_true}, @@ -4109,7 +4276,7 @@ static const InputActionData inputActionData Input::GRP_DEFAULT | Input::GRP_GUI, &Actions::serverIgnoreWhisper, InputAction::NO_VALUE, 50, - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "serverignore", UseArgs_false, Protected_true}, @@ -4119,43 +4286,47 @@ static const InputActionData inputActionData Input::GRP_DEFAULT | Input::GRP_GUI, &Actions::serverUnIgnoreWhisper, InputAction::NO_VALUE, 50, - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "serverunignore", UseArgs_false, Protected_true}, {"keyMercenaryFire", defaultAction(&Actions::mercenaryFire), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "mercenaryfire|firemercenary", UseArgs_false, Protected_true}, {"keyTargetMercenary", defaultAction(&Actions::targetMercenary), - InputCondition::INGAME | InputCondition::NOTARGET, + InputCondition::KEY_DOWN | + InputCondition::INGAME | + InputCondition::NOTARGET, "targetmercenary", UseArgs_false, Protected_false}, {"keyTargetPet", defaultAction(&Actions::targetPet), - InputCondition::INGAME | InputCondition::NOTARGET, + InputCondition::KEY_DOWN | + InputCondition::INGAME | + InputCondition::NOTARGET, "targetpet", UseArgs_false, Protected_false}, {"keyPetSetName", defaultAction(&Actions::setPetName), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "setpetname|petsetname", UseArgs_false, Protected_true}, {"keyHomunculusSetName", defaultAction(&Actions::setHomunculusName), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "sethomunname|homunsetname|sethomunculusname|homunculussetname", UseArgs_false, Protected_true}, {"keyHomunculusFire", defaultAction(&Actions::fireHomunculus), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "firehomunculus|homunculusfire|firehomun|homunfire", UseArgs_false, Protected_true}, @@ -4165,7 +4336,7 @@ static const InputActionData inputActionData Input::GRP_DEFAULT | Input::GRP_GUI, &Actions::bankWindowShow, InputAction::NO_VALUE, 50, - InputCondition::SHORTCUT0, + InputCondition::KEY_DOWN | InputCondition::SHORTCUT0, "bank|openbank", UseArgs_false, Protected_false}, @@ -4175,7 +4346,9 @@ static const InputActionData inputActionData Input::GRP_DEFAULT | Input::GRP_GUI, &Actions::prevInvTab, InputAction::NO_VALUE, 50, - InputCondition::NOINPUT | InputCondition::INGAME, + InputCondition::KEY_DOWN | + InputCondition::NOINPUT | + InputCondition::INGAME, "previnvtab", UseArgs_false, Protected_false}, @@ -4185,320 +4358,329 @@ static const InputActionData inputActionData Input::GRP_DEFAULT | Input::GRP_GUI, &Actions::nextInvTab, InputAction::NO_VALUE, 50, - InputCondition::NOINPUT | InputCondition::INGAME, + InputCondition::KEY_DOWN | + InputCondition::NOINPUT | + InputCondition::INGAME, "nextinvtab", UseArgs_false, Protected_false}, {"keyContextMenu", defaultAction(&Actions::contextMenu), - InputCondition::NOINPUT | InputCondition::NOAWAY - | InputCondition::NOMODAL | InputCondition::INGAME, + InputCondition::KEY_DOWN | + InputCondition::NOINPUT | + InputCondition::NOAWAY | + InputCondition::NOMODAL | + InputCondition::INGAME, "contextmenu", UseArgs_false, Protected_false}, {"keyBuy", defaultAction(&Actions::buy), - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "buy", UseArgs_false, Protected_false}, {"keySell", defaultAction(&Actions::sell), - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "sell", UseArgs_false, Protected_false}, {"keyWhisper2", defaultAction(&Actions::msg2), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "w2|whisper2|msg2", UseArgs_true, Protected_true}, {"keyGuild", defaultAction(&Actions::guild), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "guild", UseArgs_true, Protected_true}, {"keyNuke", defaultAction(&Actions::chatNuke), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "nuke", UseArgs_true, Protected_true}, {"keyUse", defaultAction(&Actions::useItem), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "use|useitem", UseArgs_true, Protected_true}, {"keyChatAdd", defaultAction(&Actions::chatAdd), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "addchat|chatadd", UseArgs_true, Protected_true}, {"keyWhisperText", defaultAction(&Actions::msgText), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "wt|whispertext|msgtext", UseArgs_true, Protected_true}, {"keyNavigateTo", defaultAction(&Actions::navigateTo), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "navigateto", UseArgs_true, Protected_false}, {"keyCameraMove", defaultAction(&Actions::moveCamera), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "movecamera|cameramove", UseArgs_true, Protected_false}, {"keyDropItem", defaultAction(&Actions::dropItemId), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "dropitem", UseArgs_true, Protected_true}, {"keyDropItemAll", defaultAction(&Actions::dropItemIdAll), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "dropitemall", UseArgs_true, Protected_true}, {"keyDropInv", defaultAction(&Actions::dropItemInv), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "dropinv", UseArgs_true, Protected_true}, {"keyDropInvAll", defaultAction(&Actions::dropItemInvAll), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "dropinvall", UseArgs_true, Protected_true}, {"keyUseInv", defaultAction(&Actions::useItemInv), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "useinv", UseArgs_true, Protected_true}, {"keyInvToStorage", defaultAction(&Actions::invToStorage), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "invtostorage|invstorage", UseArgs_true, Protected_true}, {"keyTradeAdd", defaultAction(&Actions::tradeAdd), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "tradeadd|addtrade", UseArgs_true, Protected_true}, {"keyStorageToInv", defaultAction(&Actions::storageToInv), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "storagetoinv|storageinv", UseArgs_true, Protected_true}, {"keyProtectItem", defaultAction(&Actions::protectItem), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "protectitem|itemprotect", UseArgs_true, Protected_true}, {"keyUnProtectItem", defaultAction(&Actions::unprotectItem), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "unprotectitem|itemunprotect", UseArgs_true, Protected_true}, {"keyKickParty", defaultAction(&Actions::kickParty), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "kickparty|partykick", UseArgs_true, Protected_true}, {"keyAddText", defaultAction(&Actions::addText), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "addtext|textadd", UseArgs_true, Protected_true}, {"keyKick", defaultAction(&Actions::kick), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "kick", UseArgs_true, Protected_true}, {"keyLeaveParty", defaultAction(&Actions::leaveParty), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "leaveparty|partyleave", UseArgs_true, Protected_true}, {"keyWarp", defaultAction(&Actions::warp), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "warp", UseArgs_true, Protected_true}, {"keyClearChat", defaultAction(&Actions::clearChat), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "clearchat|chatclear", UseArgs_false, Protected_false}, {"keyPetMoveUp", defaultAction(&Actions::petMoveUp), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "petmoveup|moveuppet", UseArgs_false, Protected_false}, {"keyPetMoveDown", defaultAction(&Actions::petMoveDown), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "petmovedown|movedownpet", UseArgs_false, Protected_false}, {"keyPetMoveLeft", defaultAction(&Actions::petMoveLeft), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "petmoveleft|moveleftpet", UseArgs_false, Protected_false}, {"keyPetMoveRight", defaultAction(&Actions::petMoveRight), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "petmoveright|moverightpet", UseArgs_false, Protected_false}, {"keyPetDirectUp", defaultAction(&Actions::petDirectUp), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "petdirectup|directuppet", UseArgs_false, Protected_false}, {"keyPetDirectDown", defaultAction(&Actions::petDirectDown), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "petdirectdown|directdownpet", UseArgs_false, Protected_false}, {"keyPetDirectLeft", defaultAction(&Actions::petDirectLeft), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "petdirectleft|directleftpet", UseArgs_false, Protected_false}, {"keyPetDirectRight", defaultAction(&Actions::petDirectRight), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "petdirectright|directrightpet", UseArgs_false, Protected_false}, {"keyPetAiStart", defaultAction(nullptr), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "", UseArgs_false, Protected_false}, {"keyPetAiStop", defaultAction(nullptr), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "", UseArgs_false, Protected_false}, {"keyGeneralTab", defaultAction(&Actions::chatGeneralTab), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "generaltab|generalchattab|general", UseArgs_false, Protected_false}, {"keyDebugTab", defaultAction(&Actions::chatDebugTab), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "debugtab|debugchattab", UseArgs_false, Protected_false}, {"keyBattleTab", defaultAction(&Actions::chatBattleTab), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "battletab|battlechattab", UseArgs_false, Protected_false}, {"keyTradeTab", defaultAction(&Actions::chatTradeTab), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "tradetab|tradechattab", UseArgs_false, Protected_false}, {"keyLangTab", defaultAction(&Actions::chatLangTab), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "langtab|langchattab", UseArgs_false, Protected_false}, {"keyGmTab", defaultAction(&Actions::chatGmTab), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "gmtab|gmchattab", UseArgs_false, Protected_false}, {"keyPartyTab", defaultAction(&Actions::chatPartyTab), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "partytab|partychattab", UseArgs_false, Protected_false}, {"keyGuildTab", defaultAction(&Actions::chatGuildTab), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "guildtab|guildchattab", UseArgs_false, Protected_false}, {"keyDropClear", defaultAction(&Actions::clearDrop), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "cleardrops|cleardrop|cleardropwindow|dropclear|dropsclear", UseArgs_false, Protected_true}, {"keyWindowCart", defaultAction(&Actions::cartWindowShow), - InputCondition::SHORTCUT0, + InputCondition::KEY_DOWN | InputCondition::SHORTCUT0, "cart|opencart", UseArgs_false, Protected_false}, {"keyMagicHealMostDamaged", defaultAction(&Actions::healmd), - InputCondition::GAME | InputCondition::VALIDSPEED, + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::VALIDSPEED, "healmd|saveass", UseArgs_false, Protected_false}, {"keyPetMove", defaultAction(&Actions::petMove), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "movepet|petmove", UseArgs_true, Protected_false}, {"keyHomunTalk", defaultAction(&Actions::homunTalk), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "homuntalk|merctalk", UseArgs_true, Protected_true}, {"keyHomunEmote", defaultAction(&Actions::commandHomunEmote), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "homunemote|mercemote", UseArgs_true, Protected_false}, {"keyHomunSmilie", defaultAction(nullptr), - InputCondition::DEFAULT | InputCondition::INGAME, + InputCondition::KEY_DOWN | + InputCondition::DEFAULT | + InputCondition::INGAME, "", UseArgs_false, Protected_false}, @@ -4508,7 +4690,7 @@ static const InputActionData inputActionData Input::GRP_HOMUN_EMOTION, &Actions::homunEmote, InputAction::HOMUN_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -4518,7 +4700,7 @@ static const InputActionData inputActionData Input::GRP_HOMUN_EMOTION, &Actions::homunEmote, InputAction::HOMUN_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -4528,7 +4710,7 @@ static const InputActionData inputActionData Input::GRP_HOMUN_EMOTION, &Actions::homunEmote, InputAction::HOMUN_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -4538,7 +4720,7 @@ static const InputActionData inputActionData Input::GRP_HOMUN_EMOTION, &Actions::homunEmote, InputAction::HOMUN_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -4548,7 +4730,7 @@ static const InputActionData inputActionData Input::GRP_HOMUN_EMOTION, &Actions::homunEmote, InputAction::HOMUN_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -4558,7 +4740,7 @@ static const InputActionData inputActionData Input::GRP_HOMUN_EMOTION, &Actions::homunEmote, InputAction::HOMUN_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -4568,7 +4750,7 @@ static const InputActionData inputActionData Input::GRP_HOMUN_EMOTION, &Actions::homunEmote, InputAction::HOMUN_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -4578,7 +4760,7 @@ static const InputActionData inputActionData Input::GRP_HOMUN_EMOTION, &Actions::homunEmote, InputAction::HOMUN_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -4588,7 +4770,7 @@ static const InputActionData inputActionData Input::GRP_HOMUN_EMOTION, &Actions::homunEmote, InputAction::HOMUN_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -4598,7 +4780,7 @@ static const InputActionData inputActionData Input::GRP_HOMUN_EMOTION, &Actions::homunEmote, InputAction::HOMUN_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -4608,7 +4790,7 @@ static const InputActionData inputActionData Input::GRP_HOMUN_EMOTION, &Actions::homunEmote, InputAction::HOMUN_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -4618,7 +4800,7 @@ static const InputActionData inputActionData Input::GRP_HOMUN_EMOTION, &Actions::homunEmote, InputAction::HOMUN_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -4628,7 +4810,7 @@ static const InputActionData inputActionData Input::GRP_HOMUN_EMOTION, &Actions::homunEmote, InputAction::HOMUN_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -4638,7 +4820,7 @@ static const InputActionData inputActionData Input::GRP_HOMUN_EMOTION, &Actions::homunEmote, InputAction::HOMUN_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -4648,7 +4830,7 @@ static const InputActionData inputActionData Input::GRP_HOMUN_EMOTION, &Actions::homunEmote, InputAction::HOMUN_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -4658,7 +4840,7 @@ static const InputActionData inputActionData Input::GRP_HOMUN_EMOTION, &Actions::homunEmote, InputAction::HOMUN_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -4668,7 +4850,7 @@ static const InputActionData inputActionData Input::GRP_HOMUN_EMOTION, &Actions::homunEmote, InputAction::HOMUN_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -4678,7 +4860,7 @@ static const InputActionData inputActionData Input::GRP_HOMUN_EMOTION, &Actions::homunEmote, InputAction::HOMUN_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -4688,7 +4870,7 @@ static const InputActionData inputActionData Input::GRP_HOMUN_EMOTION, &Actions::homunEmote, InputAction::HOMUN_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -4698,7 +4880,7 @@ static const InputActionData inputActionData Input::GRP_HOMUN_EMOTION, &Actions::homunEmote, InputAction::HOMUN_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -4708,7 +4890,7 @@ static const InputActionData inputActionData Input::GRP_HOMUN_EMOTION, &Actions::homunEmote, InputAction::HOMUN_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -4718,7 +4900,7 @@ static const InputActionData inputActionData Input::GRP_HOMUN_EMOTION, &Actions::homunEmote, InputAction::HOMUN_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -4728,7 +4910,7 @@ static const InputActionData inputActionData Input::GRP_HOMUN_EMOTION, &Actions::homunEmote, InputAction::HOMUN_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -4738,7 +4920,7 @@ static const InputActionData inputActionData Input::GRP_HOMUN_EMOTION, &Actions::homunEmote, InputAction::HOMUN_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -4748,7 +4930,7 @@ static const InputActionData inputActionData Input::GRP_HOMUN_EMOTION, &Actions::homunEmote, InputAction::HOMUN_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -4758,7 +4940,7 @@ static const InputActionData inputActionData Input::GRP_HOMUN_EMOTION, &Actions::homunEmote, InputAction::HOMUN_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -4768,7 +4950,7 @@ static const InputActionData inputActionData Input::GRP_HOMUN_EMOTION, &Actions::homunEmote, InputAction::HOMUN_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -4778,7 +4960,7 @@ static const InputActionData inputActionData Input::GRP_HOMUN_EMOTION, &Actions::homunEmote, InputAction::HOMUN_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -4788,7 +4970,7 @@ static const InputActionData inputActionData Input::GRP_HOMUN_EMOTION, &Actions::homunEmote, InputAction::HOMUN_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -4798,7 +4980,7 @@ static const InputActionData inputActionData Input::GRP_HOMUN_EMOTION, &Actions::homunEmote, InputAction::HOMUN_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -4808,7 +4990,7 @@ static const InputActionData inputActionData Input::GRP_HOMUN_EMOTION, &Actions::homunEmote, InputAction::HOMUN_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -4818,7 +5000,7 @@ static const InputActionData inputActionData Input::GRP_HOMUN_EMOTION, &Actions::homunEmote, InputAction::HOMUN_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -4828,7 +5010,7 @@ static const InputActionData inputActionData Input::GRP_HOMUN_EMOTION, &Actions::homunEmote, InputAction::HOMUN_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -4838,7 +5020,7 @@ static const InputActionData inputActionData Input::GRP_HOMUN_EMOTION, &Actions::homunEmote, InputAction::HOMUN_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -4848,7 +5030,7 @@ static const InputActionData inputActionData Input::GRP_HOMUN_EMOTION, &Actions::homunEmote, InputAction::HOMUN_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -4858,7 +5040,7 @@ static const InputActionData inputActionData Input::GRP_HOMUN_EMOTION, &Actions::homunEmote, InputAction::HOMUN_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -4868,7 +5050,7 @@ static const InputActionData inputActionData Input::GRP_HOMUN_EMOTION, &Actions::homunEmote, InputAction::HOMUN_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -4878,7 +5060,7 @@ static const InputActionData inputActionData Input::GRP_HOMUN_EMOTION, &Actions::homunEmote, InputAction::HOMUN_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -4888,7 +5070,7 @@ static const InputActionData inputActionData Input::GRP_HOMUN_EMOTION, &Actions::homunEmote, InputAction::HOMUN_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -4898,7 +5080,7 @@ static const InputActionData inputActionData Input::GRP_HOMUN_EMOTION, &Actions::homunEmote, InputAction::HOMUN_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -4908,7 +5090,7 @@ static const InputActionData inputActionData Input::GRP_HOMUN_EMOTION, &Actions::homunEmote, InputAction::HOMUN_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -4918,7 +5100,7 @@ static const InputActionData inputActionData Input::GRP_HOMUN_EMOTION, &Actions::homunEmote, InputAction::HOMUN_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -4928,7 +5110,7 @@ static const InputActionData inputActionData Input::GRP_HOMUN_EMOTION, &Actions::homunEmote, InputAction::HOMUN_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -4938,7 +5120,7 @@ static const InputActionData inputActionData Input::GRP_HOMUN_EMOTION, &Actions::homunEmote, InputAction::HOMUN_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -4948,7 +5130,7 @@ static const InputActionData inputActionData Input::GRP_HOMUN_EMOTION, &Actions::homunEmote, InputAction::HOMUN_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -4958,7 +5140,7 @@ static const InputActionData inputActionData Input::GRP_HOMUN_EMOTION, &Actions::homunEmote, InputAction::HOMUN_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -4968,7 +5150,7 @@ static const InputActionData inputActionData Input::GRP_HOMUN_EMOTION, &Actions::homunEmote, InputAction::HOMUN_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, @@ -4978,37 +5160,37 @@ static const InputActionData inputActionData Input::GRP_HOMUN_EMOTION, &Actions::homunEmote, InputAction::HOMUN_EMOTE, 100, - InputCondition::GAME, + InputCondition::KEY_DOWN | InputCondition::GAME, "", UseArgs_false, Protected_false}, {"keyKickGuild", defaultAction(&Actions::kickGuild), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "kickguild|guildkick", UseArgs_true, Protected_true}, {"keyHat", defaultAction(&Actions::hat), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "hat|hats|showhat", UseArgs_false, Protected_false}, {"keyCreatePublicRoom", defaultAction(&Actions::createPublicChatRoom), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "createroom|createpublicroom", UseArgs_true, Protected_true}, {"keyJoinRoom", defaultAction(&Actions::joinChatRoom), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "joinroom", UseArgs_true, Protected_true}, {"keyLeaveRoom", defaultAction(&Actions::leaveChatRoom), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "leaveroom", UseArgs_false, Protected_true}, @@ -5018,7 +5200,9 @@ static const InputActionData inputActionData Input::GRP_DEFAULT | Input::GRP_GUI, &Actions::quickWindowShow, InputAction::NO_VALUE, 50, - InputCondition::GAME | InputCondition::NOTARGET, + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::NOTARGET, "yellowbar|quickoptions", UseArgs_false, Protected_false}, @@ -5028,62 +5212,65 @@ static const InputActionData inputActionData Input::GRP_DEFAULT | Input::GRP_GUI, &Actions::mailWindowShow, InputAction::NO_VALUE, 50, - InputCondition::GAME | InputCondition::NOTARGET, + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::NOTARGET, "mailwindow|mail", UseArgs_false, Protected_false}, {"keyConfSet", defaultAction(&Actions::confSet), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "confset|setconf", UseArgs_true, Protected_true}, {"keyServerConfSet", defaultAction(&Actions::serverConfSet), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "servconfset|setservconf", UseArgs_true, Protected_true}, {"keyConfGet", defaultAction(&Actions::confGet), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "confget|getconf", UseArgs_true, Protected_true}, {"keyServerConfGet", defaultAction(&Actions::serverConfGet), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "servconfget|getservconf", UseArgs_true, Protected_true}, {"keyChangeTargetingType", defaultAction(&Actions::changeTargetingType), - InputCondition::GAME | InputCondition::VALIDSPEED - | InputCondition::EMODS, + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::VALIDSPEED | InputCondition::EMODS, "", UseArgs_false, Protected_true}, {"keyTestInfo", defaultAction(&Actions::testInfo), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "testinfo", UseArgs_false, Protected_true}, {"keySlide", defaultAction(&Actions::slide), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "slide", UseArgs_true, Protected_true}, {"keySelectSkillLevel", defaultAction(&Actions::selectSkillLevel), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "selectskilllevel", UseArgs_true, Protected_true}, {"keySkill", defaultAction(&Actions::skill), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "skill|useskill", UseArgs_true, Protected_true}, @@ -5093,8 +5280,10 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::craftKey, InputAction::NO_VALUE, 100, - InputCondition::NOMODAL | InputCondition::NOAWAY - | InputCondition::NONPCINPUT, + InputCondition::KEY_DOWN | + InputCondition::NOMODAL | + InputCondition::NOAWAY | + InputCondition::NONPCINPUT, "", UseArgs_false, Protected_true}, @@ -5104,8 +5293,10 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::craftKey, InputAction::NO_VALUE, 100, - InputCondition::NOMODAL | InputCondition::NOAWAY - | InputCondition::NONPCINPUT, + InputCondition::KEY_DOWN | + InputCondition::NOMODAL | + InputCondition::NOAWAY | + InputCondition::NONPCINPUT, "", UseArgs_false, Protected_true}, @@ -5115,8 +5306,10 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::craftKey, InputAction::NO_VALUE, 100, - InputCondition::NOMODAL | InputCondition::NOAWAY - | InputCondition::NONPCINPUT, + InputCondition::KEY_DOWN | + InputCondition::NOMODAL | + InputCondition::NOAWAY | + InputCondition::NONPCINPUT, "", UseArgs_false, Protected_true}, @@ -5126,8 +5319,10 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::craftKey, InputAction::NO_VALUE, 100, - InputCondition::NOMODAL | InputCondition::NOAWAY - | InputCondition::NONPCINPUT, + InputCondition::KEY_DOWN | + InputCondition::NOMODAL | + InputCondition::NOAWAY | + InputCondition::NONPCINPUT, "", UseArgs_false, Protected_true}, @@ -5137,8 +5332,10 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::craftKey, InputAction::NO_VALUE, 100, - InputCondition::NOMODAL | InputCondition::NOAWAY - | InputCondition::NONPCINPUT, + InputCondition::KEY_DOWN | + InputCondition::NOMODAL | + InputCondition::NOAWAY | + InputCondition::NONPCINPUT, "", UseArgs_false, Protected_true}, @@ -5148,8 +5345,10 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::craftKey, InputAction::NO_VALUE, 100, - InputCondition::NOMODAL | InputCondition::NOAWAY - | InputCondition::NONPCINPUT, + InputCondition::KEY_DOWN | + InputCondition::NOMODAL | + InputCondition::NOAWAY | + InputCondition::NONPCINPUT, "", UseArgs_false, Protected_true}, @@ -5159,8 +5358,10 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::craftKey, InputAction::NO_VALUE, 100, - InputCondition::NOMODAL | InputCondition::NOAWAY - | InputCondition::NONPCINPUT, + InputCondition::KEY_DOWN | + InputCondition::NOMODAL | + InputCondition::NOAWAY | + InputCondition::NONPCINPUT, "", UseArgs_false, Protected_true}, @@ -5170,8 +5371,10 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::craftKey, InputAction::NO_VALUE, 100, - InputCondition::NOMODAL | InputCondition::NOAWAY - | InputCondition::NONPCINPUT, + InputCondition::KEY_DOWN | + InputCondition::NOMODAL | + InputCondition::NOAWAY | + InputCondition::NONPCINPUT, "", UseArgs_false, Protected_true}, @@ -5181,566 +5384,574 @@ static const InputActionData inputActionData Input::GRP_DEFAULT, &Actions::craftKey, InputAction::NO_VALUE, 100, - InputCondition::NOMODAL | InputCondition::NOAWAY - | InputCondition::NONPCINPUT, + InputCondition::KEY_DOWN | + InputCondition::NOMODAL | + InputCondition::NOAWAY | + InputCondition::NONPCINPUT, "", UseArgs_false, Protected_true}, {"keyCraft", defaultAction(&Actions::craft), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "craft", UseArgs_true, Protected_true}, {"keyChatClipboard", defaultAction(&Actions::chatClipboard), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "chatclipboard", UseArgs_true, Protected_true}, {"keyNpcClipboard", defaultAction(&Actions::npcClipboard), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "npcclipboard", UseArgs_true, Protected_true}, {"keyAddPickup", defaultAction(&Actions::addPickup), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "addpickup|pickupadd", UseArgs_true, Protected_true}, {"keyRemovePickup", defaultAction(&Actions::removePickup), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "removepickup|pickupremove", UseArgs_true, Protected_true}, {"keyIgnorePickup", defaultAction(&Actions::ignorePickup), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "ignorepickup|pickupignore", UseArgs_true, Protected_true}, {"keyResetModifiers", defaultAction(&Actions::resetGameModifiers), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "resetyellowbar|resetmodifiers|resetgamemodifiers", UseArgs_false, Protected_true}, {"keyBarToChat", defaultAction(&Actions::barToChat), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "bartochat", UseArgs_true, Protected_true}, {"keySeenCmd", defaultAction(&Actions::seen), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "seen|lastseen", UseArgs_true, Protected_true}, {"keyTargetSkillUnit", defaultAction(&Actions::targetSkillUnit), - InputCondition::INGAME | InputCondition::NOTARGET, + InputCondition::KEY_DOWN | + InputCondition::INGAME | + InputCondition::NOTARGET, "targetskillunit|targetskill", UseArgs_false, Protected_false}, {"keyMonsterInfo", defaultAction(&Actions::monsterInfo), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "monsterinfo|mobinfo|mi", UseArgs_true, Protected_true}, {"keyItemInfo", defaultAction(&Actions::itemInfo), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "iteminfo|ii", UseArgs_true, Protected_true}, {"keyWhoDrops", defaultAction(&Actions::whoDrops), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "whodrops|whodrop", UseArgs_true, Protected_true}, {"keyMobSearch", defaultAction(&Actions::mobSearch), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "mobsearch|monstersearch", UseArgs_true, Protected_true}, {"keyMobSpawnSearch", defaultAction(&Actions::mobSpawnSearch), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "mobspawnsearch|monsterspawnsearch|whereis", UseArgs_true, Protected_true}, {"keyPlayerGmCommands", defaultAction(&Actions::playerGmCommands), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "gmcommands|playergmcommands|playercommands", UseArgs_true, Protected_true}, {"keyPlayerCharGmCommands", defaultAction(&Actions::playerCharGmCommands), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "gmcharcommands|playerchargmcommands|playercharcommands", UseArgs_true, Protected_true}, {"keyCommandShowLevel", defaultAction(&Actions::commandShowLevel), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "showlevel|exp", UseArgs_true, Protected_true}, {"keyCommandShowStats", defaultAction(&Actions::commandShowStats), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "showstats|stats", UseArgs_true, Protected_true}, {"keyCommandShowStorageList", defaultAction(&Actions::commandShowStorage), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "showstorage|storagelist", UseArgs_true, Protected_true}, {"keyCommandShowCartList", defaultAction(&Actions::commandShowCart), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "showcart|cartlist", UseArgs_true, Protected_true}, {"keyCommandShowInventoryList", defaultAction(&Actions::commandShowInventory), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "showinventory|inventorylist|itemlist", UseArgs_true, Protected_true}, {"keyLocatePlayer", defaultAction(&Actions::locatePlayer), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "locate|locateplayer|whereplayer", UseArgs_true, Protected_true}, {"keyCommandShowAccountInfo", defaultAction(&Actions::commandShowAccountInfo), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "showaccountinfo|showaccinfo|accinfo", UseArgs_true, Protected_true}, {"keyCommandSpawn", defaultAction(&Actions::commandSpawn), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "spawn|monster", UseArgs_true, Protected_true}, {"keyCommandSpawnSlave", defaultAction(&Actions::commandSpawnSlave), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "spawnslave|monsterslave|summon", UseArgs_true, Protected_true}, {"keyCommandSpawnClone", defaultAction(&Actions::commandSpawnClone), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "spawnclone|playerclone|clone", UseArgs_true, Protected_true}, {"keyCommandSpawnSlaveClone", defaultAction(&Actions::commandSpawnSlaveClone), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "spawnslaveclone|playerslaveclone|slaveclone", UseArgs_true, Protected_true}, {"keyCommandSpawnEvilClone", defaultAction(&Actions::commandSpawnEvilClone), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "spawnevilclone|playerevilclone|evilclone", UseArgs_true, Protected_true}, {"keyCommandSavePosition", defaultAction(&Actions::commandSavePosition), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "savepos|saveposition", UseArgs_true, Protected_true}, {"keyCommandLoadPosition", defaultAction(&Actions::commandLoadPosition), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "loadpos|loadposition", UseArgs_true, Protected_true}, {"keyCommandRandomWarp", defaultAction(&Actions::commandRandomWarp), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "randomwarp|jump", UseArgs_true, Protected_true}, {"keyCommandGotoNpc", defaultAction(&Actions::commandGotoNpc), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "gotonpc|warptonpc", UseArgs_true, Protected_true}, {"keyCommandKiller", defaultAction(&Actions::commandKiller), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "setkiller|killer", UseArgs_true, Protected_true}, {"keyCommandKillable", defaultAction(&Actions::commandKillable), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "setkillable|killable", UseArgs_true, Protected_true}, {"keyCommandHeal", defaultAction(&Actions::commandHeal), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "gmheal", UseArgs_true, Protected_true}, {"keyCommandAlive", defaultAction(&Actions::commandAlive), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "alive|revive", UseArgs_true, Protected_true}, {"keyCommandDisguise", defaultAction(&Actions::commandDisguise), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "disguise", UseArgs_true, Protected_true}, {"keyCommandImmortal", defaultAction(&Actions::commandImmortal), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "immortal", UseArgs_true, Protected_true}, {"keyCommandHide", defaultAction(&Actions::commandHide), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "hide", UseArgs_true, Protected_true}, {"keyCommandNuke", defaultAction(&Actions::commandNuke), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "gmnuke", UseArgs_true, Protected_true}, {"keyCommandKill", defaultAction(&Actions::commandKill), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "kill", UseArgs_true, Protected_true}, {"keyCommandJail", defaultAction(&Actions::commandJail), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "jail", UseArgs_true, Protected_true}, {"keyCommandUnjail", defaultAction(&Actions::commandUnjail), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "unjail", UseArgs_true, Protected_true}, {"keyCommandNpcMove", defaultAction(&Actions::commandNpcMove), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "npcmove|movenpc|warpnpc|npcwarp", UseArgs_true, Protected_true}, {"keyCommandNpcHide", defaultAction(&Actions::commandNpcHide), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "npchide|hidenpc", UseArgs_true, Protected_true}, {"keyCommandNpcShow", defaultAction(&Actions::commandNpcShow), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "npcshow|shownpc", UseArgs_true, Protected_true}, {"keyCommandChangePartyLeader", defaultAction(&Actions::commandChangePartyLeader), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "gmpartyleader|changepartyleader", UseArgs_true, Protected_true}, {"keyCommandPartyRecall", defaultAction(&Actions::commandPartyRecall), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "partyrecall|recallparty", UseArgs_true, Protected_true}, {"keyCommandBreakGuild", defaultAction(&Actions::commandBreakGuild), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "breakguild|gmbreakguild", UseArgs_true, Protected_true}, {"keyCommandGuildRecall", defaultAction(&Actions::commandGuildRecall), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "guildrecall|recallguild", UseArgs_true, Protected_true}, {"keyMailTo", defaultAction(&Actions::mailTo), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "mailto", UseArgs_true, Protected_true}, {"keyAdoptChild", defaultAction(&Actions::adoptChild), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "adoptchild|childadopt|askforchild", UseArgs_true, Protected_true}, {"keyDumpMemmoryUsage", defaultAction(&Actions::dumpMemoryUsage), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "dumpmemoryusage|memoryusage", UseArgs_false, Protected_true}, {"keySetEmoteType", defaultAction(&Actions::setEmoteType), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "setemotetype", UseArgs_true, Protected_true}, {"keyCameraRestore", defaultAction(&Actions::restoreCamera), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "restorecamera|returncamera|camerarestore", UseArgs_false, Protected_false}, {"keyShowSkillLevels", defaultAction(&Actions::showSkillLevels), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "showskilllevels", UseArgs_true, Protected_true}, {"keyShowskilltype", defaultAction(&Actions::showSkillType), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "showskilltypes", UseArgs_true, Protected_true}, {"keySelectSkillType", defaultAction(&Actions::selectSkillType), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "selectskilltype", UseArgs_true, Protected_true}, {"keyShowSkillOffsetX", defaultAction(&Actions::showSkillOffsetX), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "showskilloffsetx", UseArgs_true, Protected_true}, {"keyShowSkillOffsetY", defaultAction(&Actions::showSkillOffsetY), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "showskilloffsety", UseArgs_true, Protected_true}, {"keySetSkillOffsetX", defaultAction(&Actions::setSkillOffsetX), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "setskilloffsetx", UseArgs_true, Protected_true}, {"keySetSkillOffsetY", defaultAction(&Actions::setSkillOffsetY), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "setskilloffsety", UseArgs_true, Protected_true}, {"keyLeaveGuild", defaultAction(&Actions::leaveGuild), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "leaveguild|guildleave", UseArgs_false, Protected_true}, {"keyGuildNotice", defaultAction(&Actions::guildNotice), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "notice|guildnotice", UseArgs_true, Protected_true}, {"keyPartyItemShare", defaultAction(&Actions::partyItemShare), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "itemshare|shareitem", UseArgs_true, Protected_true}, {"keyPartyExpShare", defaultAction(&Actions::partyExpShare), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "expshare|shareexp", UseArgs_true, Protected_true}, {"keyPartyAutoItemShare", defaultAction(&Actions::partyAutoItemShare), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "autoitemshare|shareautoitem|itemautoshare", UseArgs_true, Protected_true}, {"keyCreateItem", defaultAction(&Actions::createItem), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "createitem", UseArgs_true, Protected_true}, {"keyCopyOutfitToChat", defaultAction(&Actions::outfitToChat), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "outfittochat|copyoutfittochat", UseArgs_false, Protected_true}, {"keyCommandTranslate", defaultAction(&Actions::translate), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "translate|trans|tran", UseArgs_false, Protected_true}, {"keyCommandSendGuiKey", defaultAction(&Actions::sendGuiKey), - InputCondition::ENABLED, + InputCondition::KEY_DOWN | InputCondition::ENABLED, "guikey|sendguikey", UseArgs_true, Protected_true}, {"keyMoveAttackUp", defaultAction(&Actions::moveAttackUp), - InputCondition::ENABLED, + InputCondition::KEY_DOWN | InputCondition::ENABLED, "attackmoveup|moveattackup", UseArgs_true, Protected_true}, {"keyMoveAttackDown", defaultAction(&Actions::moveAttackDown), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "attackmovedown|moveattackdown", UseArgs_true, Protected_true}, {"keyMovePriorityAttackUp", defaultAction(&Actions::movePriorityAttackUp), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "attackmovepriorityup|movepriorityattackup", UseArgs_true, Protected_true}, {"keyMovePriorityAttackDown", defaultAction(&Actions::movePriorityAttackDown), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "attackmoveprioritydown|movepriorityattackdown", UseArgs_true, Protected_true}, {"keyShowItems", defaultAction(&Actions::showItems), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "showitems|items|itemsshow", UseArgs_true, Protected_true}, {"keyCommandSendMouseKey", defaultAction(&Actions::sendMouseKey), - InputCondition::ENABLED, + InputCondition::KEY_DOWN | InputCondition::ENABLED, "mousekey|sendmousekey", UseArgs_true, Protected_true}, {"keyCommandSendChars", defaultAction(&Actions::sendChars), - InputCondition::ENABLED, + InputCondition::KEY_DOWN | InputCondition::ENABLED, "sendchar|sendchars|charsend", UseArgs_true, Protected_true}, {"keyClearOutfit", defaultAction(&Actions::outfitClear), - InputCondition::DEFAULT | InputCondition::INGAME, + InputCondition::KEY_DOWN | + InputCondition::DEFAULT | + InputCondition::INGAME, "clearoutfit|outfitclear", UseArgs_false, Protected_true}, {"keyClipboardCopy", defaultAction(&Actions::clipboardCopy), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "clipboardcopy|copyclipboard", UseArgs_true, Protected_true}, {"keyGotoPc", defaultAction(&Actions::commandGotoPc), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "goto|gotopc", UseArgs_true, Protected_true}, {"keyCommandRecallPc", defaultAction(&Actions::commandRecallPc), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "recall|recallpc", UseArgs_true, Protected_true}, {"keyCommandIpCheck", defaultAction(&Actions::commandIpCheck), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "ipcheck|checkip", UseArgs_true, Protected_true}, {"keyWindowServerInfo", defaultAction(&Actions::serverInfoWindowShow), - InputCondition::GAME | InputCondition::NOTARGET, + InputCondition::KEY_DOWN | + InputCondition::GAME | + InputCondition::NOTARGET, "serverinfo|infoserver", UseArgs_false, Protected_false}, {"keyMercenaryToMaster", defaultAction(&Actions::mercenaryToMaster), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "mercenarytomaster|mercmaster", UseArgs_false, Protected_false}, {"keyHomunculusToMaster", defaultAction(&Actions::homunculusToMaster), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "homunculustomaster|homunmaster", UseArgs_false, Protected_false}, {"keyHomunculusFeed", defaultAction(&Actions::homunculusFeed), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "homunculusfeed|homunfeed|feedhomun|feedhomunculus", UseArgs_false, Protected_false}, {"keyPetFeed", defaultAction(&Actions::petFeed), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "petfeed|feedpet", UseArgs_false, Protected_false}, {"keyPetDropLoot", defaultAction(&Actions::petDropLoot), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "petdroploot|petloot", UseArgs_false, Protected_true}, {"keyPetReturnToEgg", defaultAction(&Actions::petReturnToEgg), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "pettoegg|petegg|petreturn|returnpet|petreturnegg", UseArgs_false, Protected_false}, {"keyPetUnequip", defaultAction(&Actions::petUnequip), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "petunequip|unequippet", UseArgs_false, Protected_false}, {"keyAddSkillShortcut", defaultAction(&Actions::addSkillShortcut), - InputCondition::INGAME, + InputCondition::KEY_DOWN | InputCondition::INGAME, "addskillshortcut|skillshortcut", UseArgs_true, Protected_false}, diff --git a/src/input/inputmanager.cpp b/src/input/inputmanager.cpp index 42a4e3b25..cf8c75cd6 100644 --- a/src/input/inputmanager.cpp +++ b/src/input/inputmanager.cpp @@ -603,7 +603,7 @@ bool InputManager::handleEvent(const SDL_Event &restrict event) restrict2 #endif // USE_SDL2 keyboard.refreshActiveKeys(); - updateConditionMask(); + updateConditionMask(true); if (handleAssignKey(event, InputType::KEYBOARD)) { BLOCK_END("InputManager::handleEvent") @@ -637,13 +637,13 @@ bool InputManager::handleEvent(const SDL_Event &restrict event) restrict2 #endif // USE_SDL2 keyboard.refreshActiveKeys(); - updateConditionMask(); + updateConditionMask(false); keyboard.handleDeActicateKey(event); break; } case SDL_JOYBUTTONDOWN: { - updateConditionMask(); + updateConditionMask(true); // joystick.handleActicateButton(event); if (handleAssignKey(event, InputType::JOYSTICK)) { @@ -654,7 +654,7 @@ bool InputManager::handleEvent(const SDL_Event &restrict event) restrict2 } case SDL_JOYBUTTONUP: { - updateConditionMask(); + updateConditionMask(false); // joystick.handleDeActicateButton(event); break; } @@ -693,6 +693,7 @@ bool InputManager::handleEvent(const SDL_Event &restrict event) restrict2 switch (event.type) { case SDL_KEYDOWN: + case SDL_KEYUP: if (triggerAction(keyboard.getActionVector(event))) { BLOCK_END("InputManager::handleEvent") @@ -735,7 +736,7 @@ void InputManager::handleRepeat() joystick->handleRepeat(time); } -void InputManager::updateConditionMask() restrict2 +void InputManager::updateConditionMask(const bool pressed) restrict2 { mMask = 1; if (keyboard.isEnabled()) @@ -823,6 +824,10 @@ void InputManager::updateConditionMask() restrict2 { mMask |= InputCondition::NOTARGET; } + if (pressed == true) + mMask |= InputCondition::KEY_DOWN; + else + mMask |= InputCondition::KEY_UP; } bool InputManager::checkKey(const InputActionData *restrict const key) const diff --git a/src/input/inputmanager.h b/src/input/inputmanager.h index 6deb64858..012c06f7d 100644 --- a/src/input/inputmanager.h +++ b/src/input/inputmanager.h @@ -138,7 +138,7 @@ class InputManager final static void update(); - void updateConditionMask() restrict2; + void updateConditionMask(const bool pressed) restrict2; InputActionT getActionByKey(const SDL_Event &restrict event) const restrict2 A_WARN_UNUSED; diff --git a/src/input/touch/touchactions.cpp b/src/input/touch/touchactions.cpp index ae79dd182..f1f8e4676 100644 --- a/src/input/touch/touchactions.cpp +++ b/src/input/touch/touchactions.cpp @@ -98,7 +98,7 @@ static void moveChar(int x, int y) touchManager.setActionActive(InputAction::MOVE_DOWN, false); touchManager.setActionActive(InputAction::MOVE_UP, false); } - inputManager.updateConditionMask(); + inputManager.updateConditionMask(true); } impHandler(padClick) |