diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-08-21 18:00:14 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-08-21 18:00:14 +0300 |
commit | 436af5a6f710f93270eb62ddacfd64392612405c (patch) | |
tree | be50481b1d8bfb3ae70c329b994908113c115a18 /src/input | |
parent | 21f6509d7648f96c348b77babdca164cec2f0c61 (diff) | |
download | mv-436af5a6f710f93270eb62ddacfd64392612405c.tar.gz mv-436af5a6f710f93270eb62ddacfd64392612405c.tar.bz2 mv-436af5a6f710f93270eb62ddacfd64392612405c.tar.xz mv-436af5a6f710f93270eb62ddacfd64392612405c.zip |
Change actions namespace from ActionManager into Actions.
Diffstat (limited to 'src/input')
-rw-r--r-- | src/input/inputactionmap.h | 516 |
1 files changed, 258 insertions, 258 deletions
diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h index b2a03e0a8..538a80882 100644 --- a/src/input/inputactionmap.h +++ b/src/input/inputactionmap.h @@ -45,35 +45,35 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputType::KEYBOARD, SDLK_UP, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::moveUp, + &Actions::moveUp, InputAction::NO_VALUE, 50, InputCondition::ARROWKEYS}, {"keyMoveDown", InputType::KEYBOARD, SDLK_DOWN, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::moveDown, + &Actions::moveDown, InputAction::NO_VALUE, 50, InputCondition::ARROWKEYS}, {"keyMoveLeft", InputType::KEYBOARD, SDLK_LEFT, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::moveLeft, + &Actions::moveLeft, InputAction::NO_VALUE, 50, InputCondition::ARROWKEYS}, {"keyMoveRight", InputType::KEYBOARD, SDLK_RIGHT, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::moveRight, + &Actions::moveRight, InputAction::NO_VALUE, 50, InputCondition::ARROWKEYS}, {"keyAttack", InputType::KEYBOARD, SDLK_x, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT | Input::GRP_REPEAT, - &ActionManager::attack, + &Actions::attack, InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::NOFOLLOW | InputCondition::VALIDSPEED}, @@ -81,7 +81,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputType::KEYBOARD, SDLK_LCTRL, InputType::JOYSTICK, 0, Input::GRP_DEFAULT, - &ActionManager::targetAttack, + &Actions::targetAttack, InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::NOFOLLOW | InputCondition::VALIDSPEED}, @@ -89,14 +89,14 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputType::KEYBOARD, SDLK_v, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::moveToTarget, + &Actions::moveToTarget, InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::VALIDSPEED}, {"keyChangeMoveToTarget", InputType::KEYBOARD, SDLK_PERIOD, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::changeMoveToTarget, + &Actions::changeMoveToTarget, InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::VALIDSPEED | InputCondition::EMODS}, @@ -104,14 +104,14 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputType::KEYBOARD, SDLK_d, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::moveToHome, + &Actions::moveToHome, InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::VALIDSPEED}, {"keySetHome", InputType::KEYBOARD, SDLK_KP5, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::setHome, + &Actions::setHome, InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::VALIDSPEED}, {"keyMoveToPoint", @@ -125,28 +125,28 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputType::KEYBOARD, SDLK_t, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::talk, + &Actions::talk, InputAction::NO_VALUE, 50, InputCondition::GAME}, {"keyTarget", InputType::KEYBOARD, SDLK_LSHIFT, InputType::JOYSTICK, 4, Input::GRP_DEFAULT, - &ActionManager::stopAttack, + &Actions::stopAttack, InputAction::NO_VALUE, 50, InputCondition::GAME}, {"keyUnTarget", InputType::UNKNOWN, InputAction::NO_VALUE, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::untarget, + &Actions::untarget, InputAction::NO_VALUE, 50, InputCondition::GAME}, {"keyTargetMonster", InputType::KEYBOARD, SDLK_a, InputType::JOYSTICK, 3, Input::GRP_DEFAULT | Input::GRP_REPEAT, - &ActionManager::targetMonster, + &Actions::targetMonster, InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::NOTARGET | InputCondition::VALIDSPEED}, @@ -154,28 +154,28 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputType::KEYBOARD, SDLK_n, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::targetNPC, + &Actions::targetNPC, InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::NOTARGET}, {"keyTargetPlayer", InputType::KEYBOARD, SDLK_q, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::targetPlayer, + &Actions::targetPlayer, InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::NOTARGET}, {"keyPickup", InputType::KEYBOARD, SDLK_z, InputType::JOYSTICK, 1, Input::GRP_DEFAULT, - &ActionManager::pickup, + &Actions::pickup, InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::NOTARGET}, {"keyChangePickupType", InputType::KEYBOARD, SDLK_o, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::changePickupType, + &Actions::changePickupType, InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::VALIDSPEED | InputCondition::EMODS}, @@ -183,35 +183,35 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputType::KEYBOARD, SDLK_h, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT | Input::GRP_GUI, - &ActionManager::hideWindows, + &Actions::hideWindows, InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::NOTARGET}, {"keyBeingSit", InputType::KEYBOARD, SDLK_s, InputType::JOYSTICK, 2, Input::GRP_DEFAULT, - &ActionManager::sit, + &Actions::sit, InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::NOTARGET}, {"keyScreenshot", InputType::KEYBOARD, SDLK_p, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::screenshot, + &Actions::screenshot, InputAction::NO_VALUE, 50, InputCondition::NOTARGET | InputCondition::NOINPUT}, {"keyTrade", InputType::KEYBOARD, SDLK_r, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::changeTrade, + &Actions::changeTrade, InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::NOTARGET}, {"keyPathfind", InputType::KEYBOARD, SDLK_f, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::changeMapMode, + &Actions::changeMapMode, InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::NOTARGET | InputCondition::EMODS}, @@ -219,7 +219,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputType::KEYBOARD, SDLK_SPACE, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT | Input::GRP_GUI, - &ActionManager::ok, + &Actions::ok, InputAction::NO_VALUE, 50, InputCondition::NOMODAL | InputCondition::NOAWAY | InputCondition::NONPCINPUT}, @@ -231,7 +231,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputType::UNKNOWN, InputAction::NO_VALUE, #endif Input::GRP_DEFAULT, - &ActionManager::quit, + &Actions::quit, InputAction::NO_VALUE, 50, InputCondition::DEFAULT}, {"keyShortcutsKey", @@ -245,203 +245,203 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputType::KEYBOARD, SDLK_1, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::shortcut, + &Actions::shortcut, InputAction::NO_VALUE, 50, InputCondition::SHORTCUT}, {"keyShortcut2", InputType::KEYBOARD, SDLK_2, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::shortcut, + &Actions::shortcut, InputAction::NO_VALUE, 50, InputCondition::SHORTCUT}, {"keyShortcut3", InputType::KEYBOARD, SDLK_3, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::shortcut, + &Actions::shortcut, InputAction::NO_VALUE, 50, InputCondition::SHORTCUT}, {"keyShortcut4", InputType::KEYBOARD, SDLK_4, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::shortcut, + &Actions::shortcut, InputAction::NO_VALUE, 50, InputCondition::SHORTCUT}, {"keyShortcut5", InputType::KEYBOARD, SDLK_5, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::shortcut, + &Actions::shortcut, InputAction::NO_VALUE, 50, InputCondition::SHORTCUT}, {"keyShortcut6", InputType::KEYBOARD, SDLK_6, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::shortcut, + &Actions::shortcut, InputAction::NO_VALUE, 50, InputCondition::SHORTCUT}, {"keyShortcut7", InputType::KEYBOARD, SDLK_7, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::shortcut, + &Actions::shortcut, InputAction::NO_VALUE, 50, InputCondition::SHORTCUT}, {"keyShortcut8", InputType::KEYBOARD, SDLK_8, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::shortcut, + &Actions::shortcut, InputAction::NO_VALUE, 50, InputCondition::SHORTCUT}, {"keyShortcut9", InputType::KEYBOARD, SDLK_9, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::shortcut, + &Actions::shortcut, InputAction::NO_VALUE, 50, InputCondition::SHORTCUT}, {"keyShortcut10", InputType::KEYBOARD, SDLK_0, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::shortcut, + &Actions::shortcut, InputAction::NO_VALUE, 50, InputCondition::SHORTCUT}, {"keyShortcut11", InputType::KEYBOARD, SDLK_MINUS, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::shortcut, + &Actions::shortcut, InputAction::NO_VALUE, 50, InputCondition::SHORTCUT}, {"keyShortcut12", InputType::KEYBOARD, SDLK_EQUALS, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::shortcut, + &Actions::shortcut, InputAction::NO_VALUE, 50, InputCondition::SHORTCUT}, {"keyShortcut13", InputType::KEYBOARD, SDLK_BACKSPACE, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::shortcut, + &Actions::shortcut, InputAction::NO_VALUE, 50, InputCondition::SHORTCUT}, {"keyShortcut14", InputType::KEYBOARD, SDLK_INSERT, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::shortcut, + &Actions::shortcut, InputAction::NO_VALUE, 50, InputCondition::SHORTCUT}, {"keyShortcut15", InputType::KEYBOARD, SDLK_HOME, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::shortcut, + &Actions::shortcut, InputAction::NO_VALUE, 50, InputCondition::SHORTCUT}, {"keyShortcut16", InputType::UNKNOWN, InputAction::NO_VALUE, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::shortcut, + &Actions::shortcut, InputAction::NO_VALUE, 50, InputCondition::SHORTCUT}, {"keyShortcut17", InputType::UNKNOWN, InputAction::NO_VALUE, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::shortcut, + &Actions::shortcut, InputAction::NO_VALUE, 50, InputCondition::SHORTCUT}, {"keyShortcut18", InputType::UNKNOWN, InputAction::NO_VALUE, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::shortcut, + &Actions::shortcut, InputAction::NO_VALUE, 50, InputCondition::SHORTCUT}, {"keyShortcut19", InputType::UNKNOWN, InputAction::NO_VALUE, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::shortcut, + &Actions::shortcut, InputAction::NO_VALUE, 50, InputCondition::SHORTCUT}, {"keyShortcut20", InputType::UNKNOWN, InputAction::NO_VALUE, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::shortcut, + &Actions::shortcut, InputAction::NO_VALUE, 50, InputCondition::SHORTCUT}, {"keyWindowHelp", InputType::KEYBOARD, SDLK_F1, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT | Input::GRP_GUI, - &ActionManager::helpWindowShow, + &Actions::helpWindowShow, InputAction::NO_VALUE, 50, InputCondition::SHORTCUT0}, {"keyWindowStatus", InputType::KEYBOARD, SDLK_F2, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT | Input::GRP_GUI, - &ActionManager::statusWindowShow, + &Actions::statusWindowShow, InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::NOTARGET}, {"keyWindowInventory", InputType::KEYBOARD, SDLK_F3, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT | Input::GRP_GUI, - &ActionManager::inventoryWindowShow, + &Actions::inventoryWindowShow, InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::NOTARGET}, {"keyWindowEquipment", InputType::KEYBOARD, SDLK_F4, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT | Input::GRP_GUI, - &ActionManager::equipmentWindowShow, + &Actions::equipmentWindowShow, InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::NOTARGET}, {"keyWindowSkill", InputType::KEYBOARD, SDLK_F5, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT | Input::GRP_GUI, - &ActionManager::skillDialogShow, + &Actions::skillDialogShow, InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::NOTARGET}, {"keyWindowMinimap", InputType::KEYBOARD, SDLK_F6, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT | Input::GRP_GUI, - &ActionManager::minimapWindowShow, + &Actions::minimapWindowShow, InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::NOTARGET}, {"keyWindowChat", InputType::KEYBOARD, SDLK_F7, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT | Input::GRP_GUI, - &ActionManager::chatWindowShow, + &Actions::chatWindowShow, InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::NOTARGET}, {"keyWindowShortcut", InputType::KEYBOARD, SDLK_F8, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT | Input::GRP_GUI, - &ActionManager::shortcutWindowShow, + &Actions::shortcutWindowShow, InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::NOTARGET}, {"keyWindowSetup", InputType::KEYBOARD, SDLK_F9, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT | Input::GRP_GUI, - &ActionManager::setupWindowShow, + &Actions::setupWindowShow, InputAction::NO_VALUE, 50, InputCondition::NOTARGET | InputCondition::NOINPUT | InputCondition::ENABLED}, @@ -449,98 +449,98 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputType::KEYBOARD, SDLK_F10, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT | Input::GRP_GUI, - &ActionManager::debugWindowShow, + &Actions::debugWindowShow, InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::NOTARGET}, {"keyWindowSocial", InputType::KEYBOARD, SDLK_F11, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT | Input::GRP_GUI, - &ActionManager::socialWindowShow, + &Actions::socialWindowShow, InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::NOTARGET}, {"keyWindowEmoteBar", InputType::KEYBOARD, SDLK_F12, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT | Input::GRP_GUI, - &ActionManager::emoteShortcutWindowShow, + &Actions::emoteShortcutWindowShow, InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::NOTARGET}, {"keyWindowOutfit", InputType::KEYBOARD, SDLK_BACKQUOTE, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT | Input::GRP_GUI, - &ActionManager::outfitWindowShow, + &Actions::outfitWindowShow, InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::NOTARGET}, {"keyWindowShop", InputType::UNKNOWN, InputAction::NO_VALUE, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT | Input::GRP_GUI, - &ActionManager::shopWindowShow, + &Actions::shopWindowShow, InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::NOTARGET}, {"keyWindowDrop", InputType::KEYBOARD, SDLK_w, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT | Input::GRP_GUI, - &ActionManager::dropShortcutWindowShow, + &Actions::dropShortcutWindowShow, InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::NOTARGET}, {"keyWindowKills", InputType::KEYBOARD, SDLK_e, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT | Input::GRP_GUI, - &ActionManager::killStatsWindowShow, + &Actions::killStatsWindowShow, InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::NOTARGET}, {"keyWindowSpells", InputType::KEYBOARD, SDLK_j, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT | Input::GRP_GUI, - &ActionManager::spellShortcutWindowShow, + &Actions::spellShortcutWindowShow, InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::NOTARGET}, {"keyWindowBotChecker", InputType::UNKNOWN, InputAction::NO_VALUE, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT | Input::GRP_GUI, - &ActionManager::botcheckerWindowShow, + &Actions::botcheckerWindowShow, InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::NOTARGET}, {"keyWindowOnline", InputType::UNKNOWN, InputAction::NO_VALUE, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT | Input::GRP_GUI, - &ActionManager::whoIsOnlineWindowShow, + &Actions::whoIsOnlineWindowShow, InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::NOTARGET}, {"keyWindowDidYouKnow", InputType::UNKNOWN, InputAction::NO_VALUE, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT | Input::GRP_GUI, - &ActionManager::didYouKnowWindowShow, + &Actions::didYouKnowWindowShow, InputAction::NO_VALUE, 50, InputCondition::SHORTCUT0}, {"keyWindowQuests", InputType::KEYBOARD, SDLK_LEFTBRACKET, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT | Input::GRP_GUI, - &ActionManager::questsWindowShow, + &Actions::questsWindowShow, InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::NOTARGET}, {"keySocialPrevTab", InputType::UNKNOWN, InputAction::NO_VALUE, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT | Input::GRP_GUI, - &ActionManager::prevSocialTab, + &Actions::prevSocialTab, InputAction::NO_VALUE, 50, InputCondition::NOINPUT | InputCondition::INGAME}, {"keySocialNextTab", InputType::UNKNOWN, InputAction::NO_VALUE, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT | Input::GRP_GUI, - &ActionManager::nextSocialTab, + &Actions::nextSocialTab, InputAction::NO_VALUE, 50, InputCondition::NOINPUT | InputCondition::INGAME}, {"keySmilie", @@ -554,336 +554,336 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputType::KEYBOARD, SDLK_1, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_EMOTION, - &ActionManager::emote, + &Actions::emote, InputAction::EMOTE, 100, InputCondition::GAME}, {"keyEmoteShortcut2", InputType::KEYBOARD, SDLK_2, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_EMOTION, - &ActionManager::emote, + &Actions::emote, InputAction::EMOTE, 100, InputCondition::GAME}, {"keyEmoteShortcut3", InputType::KEYBOARD, SDLK_3, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_EMOTION, - &ActionManager::emote, + &Actions::emote, InputAction::EMOTE, 100, InputCondition::GAME}, {"keyEmoteShortcut4", InputType::KEYBOARD, SDLK_4, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_EMOTION, - &ActionManager::emote, + &Actions::emote, InputAction::EMOTE, 100, InputCondition::GAME}, {"keyEmoteShortcut5", InputType::KEYBOARD, SDLK_5, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_EMOTION, - &ActionManager::emote, + &Actions::emote, InputAction::EMOTE, 100, InputCondition::GAME}, {"keyEmoteShortcut6", InputType::KEYBOARD, SDLK_6, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_EMOTION, - &ActionManager::emote, + &Actions::emote, InputAction::EMOTE, 100, InputCondition::GAME}, {"keyEmoteShortcut7", InputType::KEYBOARD, SDLK_7, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_EMOTION, - &ActionManager::emote, + &Actions::emote, InputAction::EMOTE, 100, InputCondition::GAME}, {"keyEmoteShortcut8", InputType::KEYBOARD, SDLK_8, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_EMOTION, - &ActionManager::emote, + &Actions::emote, InputAction::EMOTE, 100, InputCondition::GAME}, {"keyEmoteShortcut9", InputType::KEYBOARD, SDLK_9, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_EMOTION, - &ActionManager::emote, + &Actions::emote, InputAction::EMOTE, 100, InputCondition::GAME}, {"keyEmoteShortcut10", InputType::KEYBOARD, SDLK_0, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_EMOTION, - &ActionManager::emote, + &Actions::emote, InputAction::EMOTE, 100, InputCondition::GAME}, {"keyEmoteShortcut11", InputType::KEYBOARD, SDLK_MINUS, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_EMOTION, - &ActionManager::emote, + &Actions::emote, InputAction::EMOTE, 100, InputCondition::GAME}, {"keyEmoteShortcut12", InputType::KEYBOARD, SDLK_EQUALS, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_EMOTION, - &ActionManager::emote, + &Actions::emote, InputAction::EMOTE, 100, InputCondition::GAME}, {"keyEmoteShortcut13", InputType::KEYBOARD, SDLK_BACKSPACE, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_EMOTION, - &ActionManager::emote, + &Actions::emote, InputAction::EMOTE, 100, InputCondition::GAME}, {"keyEmoteShortcut14", InputType::KEYBOARD, SDLK_INSERT, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_EMOTION, - &ActionManager::emote, + &Actions::emote, InputAction::EMOTE, 100, InputCondition::GAME}, {"keyEmoteShortcut15", InputType::KEYBOARD, SDLK_HOME, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_EMOTION, - &ActionManager::emote, + &Actions::emote, InputAction::EMOTE, 100, InputCondition::GAME}, {"keyEmoteShortcut16", InputType::KEYBOARD, SDLK_q, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_EMOTION, - &ActionManager::emote, + &Actions::emote, InputAction::EMOTE, 100, InputCondition::GAME}, {"keyEmoteShortcut17", InputType::KEYBOARD, SDLK_w, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_EMOTION, - &ActionManager::emote, + &Actions::emote, InputAction::EMOTE, 100, InputCondition::GAME}, {"keyEmoteShortcut18", InputType::KEYBOARD, SDLK_e, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_EMOTION, - &ActionManager::emote, + &Actions::emote, InputAction::EMOTE, 100, InputCondition::GAME}, {"keyEmoteShortcut19", InputType::KEYBOARD, SDLK_r, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_EMOTION, - &ActionManager::emote, + &Actions::emote, InputAction::EMOTE, 100, InputCondition::GAME}, {"keyEmoteShortcut20", InputType::KEYBOARD, SDLK_t, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_EMOTION, - &ActionManager::emote, + &Actions::emote, InputAction::EMOTE, 100, InputCondition::GAME}, {"keyEmoteShortcut21", InputType::KEYBOARD, SDLK_y, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_EMOTION, - &ActionManager::emote, + &Actions::emote, InputAction::EMOTE, 100, InputCondition::GAME}, {"keyEmoteShortcut22", InputType::KEYBOARD, SDLK_u, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_EMOTION, - &ActionManager::emote, + &Actions::emote, InputAction::EMOTE, 100, InputCondition::GAME}, {"keyEmoteShortcut23", InputType::KEYBOARD, SDLK_i, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_EMOTION, - &ActionManager::emote, + &Actions::emote, InputAction::EMOTE, 100, InputCondition::GAME}, {"keyEmoteShortcut24", InputType::KEYBOARD, SDLK_o, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_EMOTION, - &ActionManager::emote, + &Actions::emote, InputAction::EMOTE, 100, InputCondition::GAME}, {"keyEmoteShortcut25", InputType::KEYBOARD, SDLK_p, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_EMOTION, - &ActionManager::emote, + &Actions::emote, InputAction::EMOTE, 100, InputCondition::GAME}, {"keyEmoteShortcut26", InputType::KEYBOARD, SDLK_LEFTBRACKET, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_EMOTION, - &ActionManager::emote, + &Actions::emote, InputAction::EMOTE, 100, InputCondition::GAME}, {"keyEmoteShortcut27", InputType::KEYBOARD, SDLK_RIGHTBRACKET, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_EMOTION, - &ActionManager::emote, + &Actions::emote, InputAction::EMOTE, 100, InputCondition::GAME}, {"keyEmoteShortcut28", InputType::KEYBOARD, SDLK_BACKSLASH, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_EMOTION, - &ActionManager::emote, + &Actions::emote, InputAction::EMOTE, 100, InputCondition::GAME}, {"keyEmoteShortcut29", InputType::KEYBOARD, SDLK_a, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_EMOTION, - &ActionManager::emote, + &Actions::emote, InputAction::EMOTE, 100, InputCondition::GAME}, {"keyEmoteShortcut30", InputType::KEYBOARD, SDLK_s, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_EMOTION, - &ActionManager::emote, + &Actions::emote, InputAction::EMOTE, 100, InputCondition::GAME}, {"keyEmoteShortcut31", InputType::KEYBOARD, SDLK_d, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_EMOTION, - &ActionManager::emote, + &Actions::emote, InputAction::EMOTE, 100, InputCondition::GAME}, {"keyEmoteShortcut32", InputType::KEYBOARD, SDLK_f, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_EMOTION, - &ActionManager::emote, + &Actions::emote, InputAction::EMOTE, 100, InputCondition::GAME}, {"keyEmoteShortcut33", InputType::KEYBOARD, SDLK_g, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_EMOTION, - &ActionManager::emote, + &Actions::emote, InputAction::EMOTE, 100, InputCondition::GAME}, {"keyEmoteShortcut34", InputType::KEYBOARD, SDLK_h, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_EMOTION, - &ActionManager::emote, + &Actions::emote, InputAction::EMOTE, 100, InputCondition::GAME}, {"keyEmoteShortcut35", InputType::KEYBOARD, SDLK_j, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_EMOTION, - &ActionManager::emote, + &Actions::emote, InputAction::EMOTE, 100, InputCondition::GAME}, {"keyEmoteShortcut36", InputType::KEYBOARD, SDLK_k, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_EMOTION, - &ActionManager::emote, + &Actions::emote, InputAction::EMOTE, 100, InputCondition::GAME}, {"keyEmoteShortcut37", InputType::KEYBOARD, SDLK_l, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_EMOTION, - &ActionManager::emote, + &Actions::emote, InputAction::EMOTE, 100, InputCondition::GAME}, {"keyEmoteShortcut38", InputType::KEYBOARD, SDLK_SEMICOLON, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_EMOTION, - &ActionManager::emote, + &Actions::emote, InputAction::EMOTE, 100, InputCondition::GAME}, {"keyEmoteShortcut39", InputType::KEYBOARD, SDLK_QUOTE, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_EMOTION, - &ActionManager::emote, + &Actions::emote, InputAction::EMOTE, 100, InputCondition::GAME}, {"keyEmoteShortcut40", InputType::KEYBOARD, SDLK_z, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_EMOTION, - &ActionManager::emote, + &Actions::emote, InputAction::EMOTE, 100, InputCondition::GAME}, {"keyEmoteShortcut41", InputType::KEYBOARD, SDLK_x, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_EMOTION, - &ActionManager::emote, + &Actions::emote, InputAction::EMOTE, 100, InputCondition::GAME}, {"keyEmoteShortcut42", InputType::KEYBOARD, SDLK_c, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_EMOTION, - &ActionManager::emote, + &Actions::emote, InputAction::EMOTE, 100, InputCondition::GAME}, {"keyEmoteShortcut43", InputType::KEYBOARD, SDLK_v, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_EMOTION, - &ActionManager::emote, + &Actions::emote, InputAction::EMOTE, 100, InputCondition::GAME}, {"keyEmoteShortcut44", InputType::KEYBOARD, SDLK_b, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_EMOTION, - &ActionManager::emote, + &Actions::emote, InputAction::EMOTE, 100, InputCondition::GAME}, {"keyEmoteShortcut45", InputType::KEYBOARD, SDLK_n, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_EMOTION, - &ActionManager::emote, + &Actions::emote, InputAction::EMOTE, 100, InputCondition::GAME}, {"keyEmoteShortcut46", InputType::KEYBOARD, SDLK_m, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_EMOTION, - &ActionManager::emote, + &Actions::emote, InputAction::EMOTE, 100, InputCondition::GAME}, {"keyEmoteShortcut47", InputType::KEYBOARD, SDLK_COMMA, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_EMOTION, - &ActionManager::emote, + &Actions::emote, InputAction::EMOTE, 100, InputCondition::GAME}, {"keyEmoteShortcut48", InputType::KEYBOARD, SDLK_PERIOD, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_EMOTION, - &ActionManager::emote, + &Actions::emote, InputAction::EMOTE, 100, InputCondition::GAME}, {"keyWearOutfit", @@ -904,686 +904,686 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputType::KEYBOARD, SDLK_RIGHTBRACKET, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::copyEquippedToOutfit, + &Actions::copyEquippedToOutfit, InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::VALIDSPEED}, {"keyOutfitShortcut1", InputType::KEYBOARD, SDLK_1, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_OUTFIT, - &ActionManager::outfit, + &Actions::outfit, InputAction::NO_VALUE, 100, InputCondition::GAME}, {"keyOutfitShortcut2", InputType::KEYBOARD, SDLK_2, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_OUTFIT, - &ActionManager::outfit, + &Actions::outfit, InputAction::NO_VALUE, 100, InputCondition::GAME}, {"keyOutfitShortcut3", InputType::KEYBOARD, SDLK_3, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_OUTFIT, - &ActionManager::outfit, + &Actions::outfit, InputAction::NO_VALUE, 100, InputCondition::GAME}, {"keyOutfitShortcut4", InputType::KEYBOARD, SDLK_4, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_OUTFIT, - &ActionManager::outfit, + &Actions::outfit, InputAction::NO_VALUE, 100, InputCondition::GAME}, {"keyOutfitShortcut5", InputType::KEYBOARD, SDLK_5, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_OUTFIT, - &ActionManager::outfit, + &Actions::outfit, InputAction::NO_VALUE, 100, InputCondition::GAME}, {"keyOutfitShortcut6", InputType::KEYBOARD, SDLK_6, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_OUTFIT, - &ActionManager::outfit, + &Actions::outfit, InputAction::NO_VALUE, 100, InputCondition::GAME}, {"keyOutfitShortcut7", InputType::KEYBOARD, SDLK_7, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_OUTFIT, - &ActionManager::outfit, + &Actions::outfit, InputAction::NO_VALUE, 100, InputCondition::GAME}, {"keyOutfitShortcut8", InputType::KEYBOARD, SDLK_8, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_OUTFIT, - &ActionManager::outfit, + &Actions::outfit, InputAction::NO_VALUE, 100, InputCondition::GAME}, {"keyOutfitShortcut9", InputType::KEYBOARD, SDLK_9, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_OUTFIT, - &ActionManager::outfit, + &Actions::outfit, InputAction::NO_VALUE, 100, InputCondition::GAME}, {"keyOutfitShortcut10", InputType::KEYBOARD, SDLK_0, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_OUTFIT, - &ActionManager::outfit, + &Actions::outfit, InputAction::NO_VALUE, 100, InputCondition::GAME}, {"keyOutfitShortcut11", InputType::KEYBOARD, SDLK_MINUS, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_OUTFIT, - &ActionManager::outfit, + &Actions::outfit, InputAction::NO_VALUE, 100, InputCondition::GAME}, {"keyOutfitShortcut12", InputType::KEYBOARD, SDLK_EQUALS, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_OUTFIT, - &ActionManager::outfit, + &Actions::outfit, InputAction::NO_VALUE, 100, InputCondition::GAME}, {"keyOutfitShortcut13", InputType::KEYBOARD, SDLK_BACKSPACE, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_OUTFIT, - &ActionManager::outfit, + &Actions::outfit, InputAction::NO_VALUE, 100, InputCondition::GAME}, {"keyOutfitShortcut14", InputType::KEYBOARD, SDLK_INSERT, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_OUTFIT, - &ActionManager::outfit, + &Actions::outfit, InputAction::NO_VALUE, 100, InputCondition::GAME}, {"keyOutfitShortcut15", InputType::KEYBOARD, SDLK_HOME, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_OUTFIT, - &ActionManager::outfit, + &Actions::outfit, InputAction::NO_VALUE, 100, InputCondition::GAME}, {"keyOutfitShortcut16", InputType::KEYBOARD, SDLK_q, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_OUTFIT, - &ActionManager::outfit, + &Actions::outfit, InputAction::NO_VALUE, 100, InputCondition::GAME}, {"keyOutfitShortcut17", InputType::KEYBOARD, SDLK_w, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_OUTFIT, - &ActionManager::outfit, + &Actions::outfit, InputAction::NO_VALUE, 100, InputCondition::GAME}, {"keyOutfitShortcut18", InputType::KEYBOARD, SDLK_e, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_OUTFIT, - &ActionManager::outfit, + &Actions::outfit, InputAction::NO_VALUE, 100, InputCondition::GAME}, {"keyOutfitShortcut19", InputType::KEYBOARD, SDLK_r, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_OUTFIT, - &ActionManager::outfit, + &Actions::outfit, InputAction::NO_VALUE, 100, InputCondition::GAME}, {"keyOutfitShortcut20", InputType::KEYBOARD, SDLK_t, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_OUTFIT, - &ActionManager::outfit, + &Actions::outfit, InputAction::NO_VALUE, 100, InputCondition::GAME}, {"keyOutfitShortcut21", InputType::KEYBOARD, SDLK_y, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_OUTFIT, - &ActionManager::outfit, + &Actions::outfit, InputAction::NO_VALUE, 100, InputCondition::GAME}, {"keyOutfitShortcut22", InputType::KEYBOARD, SDLK_u, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_OUTFIT, - &ActionManager::outfit, + &Actions::outfit, InputAction::NO_VALUE, 100, InputCondition::GAME}, {"keyOutfitShortcut23", InputType::KEYBOARD, SDLK_i, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_OUTFIT, - &ActionManager::outfit, + &Actions::outfit, InputAction::NO_VALUE, 100, InputCondition::GAME}, {"keyOutfitShortcut24", InputType::KEYBOARD, SDLK_o, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_OUTFIT, - &ActionManager::outfit, + &Actions::outfit, InputAction::NO_VALUE, 100, InputCondition::GAME}, {"keyOutfitShortcut25", InputType::KEYBOARD, SDLK_p, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_OUTFIT, - &ActionManager::outfit, + &Actions::outfit, InputAction::NO_VALUE, 100, InputCondition::GAME}, {"keyOutfitShortcut26", InputType::KEYBOARD, SDLK_LEFTBRACKET, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_OUTFIT, - &ActionManager::outfit, + &Actions::outfit, InputAction::NO_VALUE, 100, InputCondition::GAME}, {"keyOutfitShortcut27", InputType::KEYBOARD, SDLK_RIGHTBRACKET, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_OUTFIT, - &ActionManager::outfit, + &Actions::outfit, InputAction::NO_VALUE, 100, InputCondition::GAME}, {"keyOutfitShortcut28", InputType::KEYBOARD, SDLK_BACKSLASH, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_OUTFIT, - &ActionManager::outfit, + &Actions::outfit, InputAction::NO_VALUE, 100, InputCondition::GAME}, {"keyOutfitShortcut29", InputType::KEYBOARD, SDLK_a, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_OUTFIT, - &ActionManager::outfit, + &Actions::outfit, InputAction::NO_VALUE, 100, InputCondition::GAME}, {"keyOutfitShortcut30", InputType::KEYBOARD, SDLK_s, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_OUTFIT, - &ActionManager::outfit, + &Actions::outfit, InputAction::NO_VALUE, 100, InputCondition::GAME}, {"keyOutfitShortcut31", InputType::KEYBOARD, SDLK_d, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_OUTFIT, - &ActionManager::outfit, + &Actions::outfit, InputAction::NO_VALUE, 100, InputCondition::GAME}, {"keyOutfitShortcut32", InputType::KEYBOARD, SDLK_f, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_OUTFIT, - &ActionManager::outfit, + &Actions::outfit, InputAction::NO_VALUE, 100, InputCondition::GAME}, {"keyOutfitShortcut33", InputType::KEYBOARD, SDLK_g, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_OUTFIT, - &ActionManager::outfit, + &Actions::outfit, InputAction::NO_VALUE, 100, InputCondition::GAME}, {"keyOutfitShortcut34", InputType::KEYBOARD, SDLK_h, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_OUTFIT, - &ActionManager::outfit, + &Actions::outfit, InputAction::NO_VALUE, 100, InputCondition::GAME}, {"keyOutfitShortcut35", InputType::KEYBOARD, SDLK_j, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_OUTFIT, - &ActionManager::outfit, + &Actions::outfit, InputAction::NO_VALUE, 100, InputCondition::GAME}, {"keyOutfitShortcut36", InputType::KEYBOARD, SDLK_k, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_OUTFIT, - &ActionManager::outfit, + &Actions::outfit, InputAction::NO_VALUE, 100, InputCondition::GAME}, {"keyOutfitShortcut37", InputType::KEYBOARD, SDLK_l, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_OUTFIT, - &ActionManager::outfit, + &Actions::outfit, InputAction::NO_VALUE, 100, InputCondition::GAME}, {"keyOutfitShortcut38", InputType::KEYBOARD, SDLK_SEMICOLON, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_OUTFIT, - &ActionManager::outfit, + &Actions::outfit, InputAction::NO_VALUE, 100, InputCondition::GAME}, {"keyOutfitShortcut39", InputType::KEYBOARD, SDLK_QUOTE, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_OUTFIT, - &ActionManager::outfit, + &Actions::outfit, InputAction::NO_VALUE, 100, InputCondition::GAME}, {"keyOutfitShortcut40", InputType::KEYBOARD, SDLK_z, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_OUTFIT, - &ActionManager::outfit, + &Actions::outfit, InputAction::NO_VALUE, 100, InputCondition::GAME}, {"keyOutfitShortcut41", InputType::KEYBOARD, SDLK_x, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_OUTFIT, - &ActionManager::outfit, + &Actions::outfit, InputAction::NO_VALUE, 100, InputCondition::GAME}, {"keyOutfitShortcut42", InputType::KEYBOARD, SDLK_c, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_OUTFIT, - &ActionManager::outfit, + &Actions::outfit, InputAction::NO_VALUE, 100, InputCondition::GAME}, {"keyOutfitShortcut43", InputType::KEYBOARD, SDLK_v, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_OUTFIT, - &ActionManager::outfit, + &Actions::outfit, InputAction::NO_VALUE, 100, InputCondition::GAME}, {"keyOutfitShortcut44", InputType::KEYBOARD, SDLK_b, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_OUTFIT, - &ActionManager::outfit, + &Actions::outfit, InputAction::NO_VALUE, 100, InputCondition::GAME}, {"keyOutfitShortcut45", InputType::KEYBOARD, SDLK_n, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_OUTFIT, - &ActionManager::outfit, + &Actions::outfit, InputAction::NO_VALUE, 100, InputCondition::GAME}, {"keyOutfitShortcut46", InputType::KEYBOARD, SDLK_m, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_OUTFIT, - &ActionManager::outfit, + &Actions::outfit, InputAction::NO_VALUE, 100, InputCondition::GAME}, {"keyOutfitShortcut47", InputType::KEYBOARD, SDLK_COMMA, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_OUTFIT, - &ActionManager::outfit, + &Actions::outfit, InputAction::NO_VALUE, 100, InputCondition::GAME}, {"keyOutfitShortcut48", InputType::KEYBOARD, SDLK_PERIOD, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_OUTFIT, - &ActionManager::outfit, + &Actions::outfit, InputAction::NO_VALUE, 100, InputCondition::GAME}, {"keyMoveToPointShortcut1", InputType::KEYBOARD, SDLK_1, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_MOVETOPOINT, - &ActionManager::moveToPoint, + &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, InputCondition::GAME}, {"keyMoveToPointShortcut2", InputType::KEYBOARD, SDLK_2, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_MOVETOPOINT, - &ActionManager::moveToPoint, + &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, InputCondition::GAME}, {"keyMoveToPointShortcut3", InputType::KEYBOARD, SDLK_3, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_MOVETOPOINT, - &ActionManager::moveToPoint, + &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, InputCondition::GAME}, {"keyMoveToPointShortcut4", InputType::KEYBOARD, SDLK_4, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_MOVETOPOINT, - &ActionManager::moveToPoint, + &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, InputCondition::GAME}, {"keyMoveToPointShortcut5", InputType::KEYBOARD, SDLK_5, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_MOVETOPOINT, - &ActionManager::moveToPoint, + &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, InputCondition::GAME}, {"keyMoveToPointShortcut6", InputType::KEYBOARD, SDLK_6, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_MOVETOPOINT, - &ActionManager::moveToPoint, + &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, InputCondition::GAME}, {"keyMoveToPointShortcut7", InputType::KEYBOARD, SDLK_7, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_MOVETOPOINT, - &ActionManager::moveToPoint, + &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, InputCondition::GAME}, {"keyMoveToPointShortcut8", InputType::KEYBOARD, SDLK_8, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_MOVETOPOINT, - &ActionManager::moveToPoint, + &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, InputCondition::GAME}, {"keyMoveToPointShortcut9", InputType::KEYBOARD, SDLK_9, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_MOVETOPOINT, - &ActionManager::moveToPoint, + &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, InputCondition::GAME}, {"keyMoveToPointShortcut10", InputType::KEYBOARD, SDLK_0, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_MOVETOPOINT, - &ActionManager::moveToPoint, + &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, InputCondition::GAME}, {"keyMoveToPointShortcut11", InputType::KEYBOARD, SDLK_MINUS, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_MOVETOPOINT, - &ActionManager::moveToPoint, + &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, InputCondition::GAME}, {"keyMoveToPointShortcut12", InputType::KEYBOARD, SDLK_EQUALS, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_MOVETOPOINT, - &ActionManager::moveToPoint, + &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, InputCondition::GAME}, {"keyMoveToPointShortcut13", InputType::KEYBOARD, SDLK_BACKSPACE, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_MOVETOPOINT, - &ActionManager::moveToPoint, + &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, InputCondition::GAME}, {"keyMoveToPointShortcut14", InputType::KEYBOARD, SDLK_INSERT, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_MOVETOPOINT, - &ActionManager::moveToPoint, + &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, InputCondition::GAME}, {"keyMoveToPointShortcut15", InputType::KEYBOARD, SDLK_HOME, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_MOVETOPOINT, - &ActionManager::moveToPoint, + &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, InputCondition::GAME}, {"keyMoveToPointShortcut16", InputType::KEYBOARD, SDLK_q, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_MOVETOPOINT, - &ActionManager::moveToPoint, + &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, InputCondition::GAME}, {"keyMoveToPointShortcut17", InputType::KEYBOARD, SDLK_w, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_MOVETOPOINT, - &ActionManager::moveToPoint, + &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, InputCondition::GAME}, {"keyMoveToPointShortcut18", InputType::KEYBOARD, SDLK_e, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_MOVETOPOINT, - &ActionManager::moveToPoint, + &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, InputCondition::GAME}, {"keyMoveToPointShortcut19", InputType::KEYBOARD, SDLK_r, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_MOVETOPOINT, - &ActionManager::moveToPoint, + &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, InputCondition::GAME}, {"keyMoveToPointShortcut20", InputType::KEYBOARD, SDLK_t, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_MOVETOPOINT, - &ActionManager::moveToPoint, + &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, InputCondition::GAME}, {"keyMoveToPointShortcut21", InputType::KEYBOARD, SDLK_y, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_MOVETOPOINT, - &ActionManager::moveToPoint, + &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, InputCondition::GAME}, {"keyMoveToPointShortcut22", InputType::KEYBOARD, SDLK_u, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_MOVETOPOINT, - &ActionManager::moveToPoint, + &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, InputCondition::GAME}, {"keyMoveToPointShortcut23", InputType::KEYBOARD, SDLK_i, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_MOVETOPOINT, - &ActionManager::moveToPoint, + &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, InputCondition::GAME}, {"keyMoveToPointShortcut24", InputType::KEYBOARD, SDLK_o, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_MOVETOPOINT, - &ActionManager::moveToPoint, + &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, InputCondition::GAME}, {"keyMoveToPointShortcut25", InputType::KEYBOARD, SDLK_p, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_MOVETOPOINT, - &ActionManager::moveToPoint, + &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, InputCondition::GAME}, {"keyMoveToPointShortcut26", InputType::KEYBOARD, SDLK_LEFTBRACKET, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_MOVETOPOINT, - &ActionManager::moveToPoint, + &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, InputCondition::GAME}, {"keyMoveToPointShortcut27", InputType::KEYBOARD, SDLK_RIGHTBRACKET, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_MOVETOPOINT, - &ActionManager::moveToPoint, + &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, InputCondition::GAME}, {"keyMoveToPointShortcut28", InputType::KEYBOARD, SDLK_BACKSLASH, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_MOVETOPOINT, - &ActionManager::moveToPoint, + &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, InputCondition::GAME}, {"keyMoveToPointShortcut29", InputType::KEYBOARD, SDLK_a, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_MOVETOPOINT, - &ActionManager::moveToPoint, + &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, InputCondition::GAME}, {"keyMoveToPointShortcut30", InputType::KEYBOARD, SDLK_s, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_MOVETOPOINT, - &ActionManager::moveToPoint, + &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, InputCondition::GAME}, {"keyMoveToPointShortcut31", InputType::KEYBOARD, SDLK_d, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_MOVETOPOINT, - &ActionManager::moveToPoint, + &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, InputCondition::GAME}, {"keyMoveToPointShortcut32", InputType::KEYBOARD, SDLK_f, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_MOVETOPOINT, - &ActionManager::moveToPoint, + &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, InputCondition::GAME}, {"keyMoveToPointShortcut33", InputType::KEYBOARD, SDLK_g, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_MOVETOPOINT, - &ActionManager::moveToPoint, + &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, InputCondition::GAME}, {"keyMoveToPointShortcut34", InputType::KEYBOARD, SDLK_h, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_MOVETOPOINT, - &ActionManager::moveToPoint, + &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, InputCondition::GAME}, {"keyMoveToPointShortcut35", InputType::KEYBOARD, SDLK_j, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_MOVETOPOINT, - &ActionManager::moveToPoint, + &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, InputCondition::GAME}, {"keyMoveToPointShortcut36", InputType::KEYBOARD, SDLK_k, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_MOVETOPOINT, - &ActionManager::moveToPoint, + &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, InputCondition::GAME}, {"keyMoveToPointShortcut37", InputType::KEYBOARD, SDLK_l, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_MOVETOPOINT, - &ActionManager::moveToPoint, + &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, InputCondition::GAME}, {"keyMoveToPointShortcut38", InputType::KEYBOARD, SDLK_SEMICOLON, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_MOVETOPOINT, - &ActionManager::moveToPoint, + &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, InputCondition::GAME}, {"keyMoveToPointShortcut39", InputType::KEYBOARD, SDLK_QUOTE, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_MOVETOPOINT, - &ActionManager::moveToPoint, + &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, InputCondition::GAME}, {"keyMoveToPointShortcut40", InputType::KEYBOARD, SDLK_z, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_MOVETOPOINT, - &ActionManager::moveToPoint, + &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, InputCondition::GAME}, {"keyMoveToPointShortcut41", InputType::KEYBOARD, SDLK_x, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_MOVETOPOINT, - &ActionManager::moveToPoint, + &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, InputCondition::GAME}, {"keyMoveToPointShortcut42", InputType::KEYBOARD, SDLK_c, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_MOVETOPOINT, - &ActionManager::moveToPoint, + &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, InputCondition::GAME}, {"keyMoveToPointShortcut43", InputType::KEYBOARD, SDLK_v, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_MOVETOPOINT, - &ActionManager::moveToPoint, + &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, InputCondition::GAME}, {"keyMoveToPointShortcut44", InputType::KEYBOARD, SDLK_b, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_MOVETOPOINT, - &ActionManager::moveToPoint, + &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, InputCondition::GAME}, {"keyMoveToPointShortcut45", InputType::KEYBOARD, SDLK_n, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_MOVETOPOINT, - &ActionManager::moveToPoint, + &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, InputCondition::GAME}, {"keyMoveToPointShortcut46", InputType::KEYBOARD, SDLK_m, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_MOVETOPOINT, - &ActionManager::moveToPoint, + &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, InputCondition::GAME}, {"keyMoveToPointShortcut47", InputType::KEYBOARD, SDLK_COMMA, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_MOVETOPOINT, - &ActionManager::moveToPoint, + &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, InputCondition::GAME}, {"keyMoveToPointShortcut48", InputType::KEYBOARD, SDLK_PERIOD, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_MOVETOPOINT, - &ActionManager::moveToPoint, + &Actions::moveToPoint, InputAction::MOVE_TO_POINT, 100, InputCondition::GAME}, {"keyChat", InputType::KEYBOARD, SDLK_RETURN, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT | Input::GRP_CHAT, - &ActionManager::toggleChat, + &Actions::toggleChat, InputAction::NO_VALUE, 50, InputCondition::NOINPUT | InputCondition::NOAWAY | InputCondition::NOMODAL | InputCondition::INGAME}, @@ -1591,35 +1591,35 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputType::KEYBOARD, SDLK_PAGEUP, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT | Input::GRP_GUI, - &ActionManager::scrollChatUp, + &Actions::scrollChatUp, InputAction::NO_VALUE, 50, InputCondition::DEFAULT | InputCondition::INGAME}, {"keyChatScrollDown", InputType::KEYBOARD, SDLK_PAGEDOWN, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT | Input::GRP_GUI, - &ActionManager::scrollChatDown, + &Actions::scrollChatDown, InputAction::NO_VALUE, 50, InputCondition::DEFAULT | InputCondition::INGAME}, {"keyChatPrevTab", InputType::KEYBOARD, SDLK_KP7, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT | Input::GRP_GUI, - &ActionManager::prevChatTab, + &Actions::prevChatTab, InputAction::NO_VALUE, 50, InputCondition::NOINPUT | InputCondition::INGAME}, {"keyChatNextTab", InputType::KEYBOARD, SDLK_KP9, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT | Input::GRP_GUI, - &ActionManager::nextChatTab, + &Actions::nextChatTab, InputAction::NO_VALUE, 50, InputCondition::NOINPUT | InputCondition::INGAME}, {"keyChatCloseTab", InputType::UNKNOWN, InputAction::NO_VALUE, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT | Input::GRP_GUI, - &ActionManager::closeChatTab, + &Actions::closeChatTab, InputAction::NO_VALUE, 50, InputCondition::NOINPUT | InputCondition::INGAME}, {"keyChatPrevHistory", @@ -1644,7 +1644,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { #endif InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::ignoreInput, + &Actions::ignoreInput, InputAction::NO_VALUE, 500, InputCondition::DEFAULT}, {"keyIgnoreInput2", @@ -1655,49 +1655,49 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { #endif InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::ignoreInput, + &Actions::ignoreInput, InputAction::NO_VALUE, 500, InputCondition::DEFAULT}, {"keyDirectUp", InputType::KEYBOARD, SDLK_l, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::directUp, + &Actions::directUp, InputAction::NO_VALUE, 50, InputCondition::GAME}, {"keyDirectDown", InputType::KEYBOARD, SDLK_SEMICOLON, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::directDown, + &Actions::directDown, InputAction::NO_VALUE, 50, InputCondition::GAME}, {"keyDirectLeft", InputType::KEYBOARD, SDLK_k, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::directLeft, + &Actions::directLeft, InputAction::NO_VALUE, 50, InputCondition::GAME}, {"keyDirectRight", InputType::KEYBOARD, SDLK_QUOTE, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::directRight, + &Actions::directRight, InputAction::NO_VALUE, 50, InputCondition::GAME}, {"keyCrazyMoves", InputType::KEYBOARD, SDLK_SLASH, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::crazyMoves, + &Actions::crazyMoves, InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::VALIDSPEED}, {"keyChangeCrazyMoveType", InputType::KEYBOARD, SDLK_BACKSLASH, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::changeCrazyMove, + &Actions::changeCrazyMove, InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::VALIDSPEED | InputCondition::EMODS}, @@ -1705,49 +1705,49 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputType::KEYBOARD, SDLK_y, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::dropItem0, + &Actions::dropItem0, InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::VALIDSPEED}, {"keyQuickDropN", InputType::KEYBOARD, SDLK_u, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::dropItem, + &Actions::dropItem, InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::VALIDSPEED}, {"keySwitchQuickDrop", InputType::KEYBOARD, SDLK_i, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::switchQuickDrop, + &Actions::switchQuickDrop, InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::VALIDSPEED}, {"keyMagicInma1", InputType::KEYBOARD, SDLK_c, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::heal, + &Actions::heal, InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::VALIDSPEED}, {"keyMagicItenplz", InputType::KEYBOARD, SDLK_m, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::itenplz, + &Actions::itenplz, InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::VALIDSPEED}, {"keyMagicAttack", InputType::KEYBOARD, SDLK_b, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::magicAttack, + &Actions::magicAttack, InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::VALIDSPEED}, {"keySwitchMagicAttack", InputType::KEYBOARD, SDLK_COMMA, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::changeMagicAttackType, + &Actions::changeMagicAttackType, InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::VALIDSPEED | InputCondition::EMODS}, @@ -1755,7 +1755,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputType::UNKNOWN, InputAction::NO_VALUE, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::changePvpMode, + &Actions::changePvpMode, InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::VALIDSPEED | InputCondition::EMODS}, @@ -1763,7 +1763,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputType::KEYBOARD, InputAction::NO_VALUE, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::changeMoveType, + &Actions::changeMoveType, InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::VALIDSPEED | InputCondition::EMODS}, @@ -1771,7 +1771,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputType::KEYBOARD, SDLK_g, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::changeAttackWeaponType, + &Actions::changeAttackWeaponType, InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::VALIDSPEED | InputCondition::EMODS}, @@ -1779,7 +1779,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputType::KEYBOARD, SDLK_END, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::changeAttackType, + &Actions::changeAttackType, InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::VALIDSPEED | InputCondition::EMODS}, @@ -1787,7 +1787,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputType::KEYBOARD, SDLK_KP1, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::changeFollowMode, + &Actions::changeFollowMode, InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::VALIDSPEED | InputCondition::EMODS}, @@ -1795,7 +1795,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputType::KEYBOARD, SDLK_KP4, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::changeImitationMode, + &Actions::changeImitationMode, InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::VALIDSPEED | InputCondition::EMODS}, @@ -1803,28 +1803,28 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputType::KEYBOARD, SDLK_KP8, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::changeGameModifier, + &Actions::changeGameModifier, InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::VALIDSPEED}, {"keyChangeAudio", InputType::KEYBOARD, SDLK_KP3, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::changeAudio, + &Actions::changeAudio, InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::VALIDSPEED}, {"keyAway", InputType::KEYBOARD, SDLK_KP2, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::away, + &Actions::away, InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::VALIDSPEED}, {"keyRightClick", InputType::KEYBOARD, SDLK_TAB, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::mouseClick, + &Actions::mouseClick, InputAction::NO_VALUE, 50, InputCondition::NOINPUT | InputCondition::NOAWAY | InputCondition::NOMODAL | InputCondition::INGAME}, @@ -1832,7 +1832,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputType::KEYBOARD, SDLK_KP_PLUS, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::camera, + &Actions::camera, InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::VALIDSPEED | InputCondition::EMODS}, @@ -1963,28 +1963,28 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputType::KEYBOARD, SDLK_KP_MINUS, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::safeVideoMode, + &Actions::safeVideoMode, InputAction::NO_VALUE, 50, InputCondition::DEFAULT}, {"keyStopSit", InputType::UNKNOWN, InputAction::NO_VALUE, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::stopSit, + &Actions::stopSit, InputAction::NO_VALUE, 50, InputCondition::DEFAULT | InputCondition::INGAME}, {"keyShowKeyboard", InputType::UNKNOWN, InputAction::NO_VALUE, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::showKeyboard, + &Actions::showKeyboard, InputAction::NO_VALUE, 50, InputCondition::DEFAULT}, {"keyShowWindows", InputType::UNKNOWN, InputAction::NO_VALUE, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::showWindows, + &Actions::showWindows, InputAction::NO_VALUE, 50, InputCondition::DEFAULT}, {"keyChatMod", @@ -1998,7 +1998,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputType::UNKNOWN, InputAction::NO_VALUE, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::moveForward, + &Actions::moveForward, InputAction::NO_VALUE, 50, InputCondition::ARROWKEYS}, {"keyGUICtrl", @@ -2082,35 +2082,35 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputType::UNKNOWN, InputAction::NO_VALUE, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT | Input::GRP_GUI, - &ActionManager::prevShortcutsTab, + &Actions::prevShortcutsTab, InputAction::NO_VALUE, 50, InputCondition::NOINPUT | InputCondition::INGAME}, {"keyShortcutsNextTab", InputType::UNKNOWN, InputAction::NO_VALUE, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT | Input::GRP_GUI, - &ActionManager::nextShortcutsTab, + &Actions::nextShortcutsTab, InputAction::NO_VALUE, 50, InputCondition::NOINPUT | InputCondition::INGAME}, {"keyCommandsPrevTab", InputType::UNKNOWN, InputAction::NO_VALUE, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT | Input::GRP_GUI, - &ActionManager::prevCommandsTab, + &Actions::prevCommandsTab, InputAction::NO_VALUE, 50, InputCondition::NOINPUT | InputCondition::INGAME}, {"keyCommandsNextTab", InputType::UNKNOWN, InputAction::NO_VALUE, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT | Input::GRP_GUI, - &ActionManager::nextCommandsTab, + &Actions::nextCommandsTab, InputAction::NO_VALUE, 50, InputCondition::NOINPUT | InputCondition::INGAME}, {"keyOpenTrade", InputType::UNKNOWN, InputAction::NO_VALUE, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT, - &ActionManager::openTrade, + &Actions::openTrade, InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::NOTARGET}, @@ -2202,21 +2202,21 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputType::UNKNOWN, InputAction::NO_VALUE, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT | Input::GRP_GUI, - &ActionManager::aboutWindowShow, + &Actions::aboutWindowShow, InputAction::NO_VALUE, 50, InputCondition::SHORTCUT0}, {"keyWindowUpdater", InputType::UNKNOWN, InputAction::NO_VALUE, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT | Input::GRP_GUI, - &ActionManager::updaterWindowShow, + &Actions::updaterWindowShow, InputAction::NO_VALUE, 50, InputCondition::GAME}, {"keyTargetClosestMonster", InputType::UNKNOWN, InputAction::NO_VALUE, InputType::UNKNOWN, InputAction::NO_VALUE, Input::GRP_DEFAULT | Input::GRP_REPEAT, - &ActionManager::targetClosestMonster, + &Actions::targetClosestMonster, InputAction::NO_VALUE, 50, InputCondition::GAME | InputCondition::NOTARGET | InputCondition::VALIDSPEED} |