diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-08-25 23:42:20 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-08-25 23:42:20 +0300 |
| commit | 3529ae89be2b72e34d119ed4a2aca7b30403032c (patch) | |
| tree | 3b6f795a2f6f9dc68b73daa877dd37c26772082a /src/input | |
| parent | 81b70110b56fb44b913ad58e1640909c9a7a6d3c (diff) | |
| download | mv-3529ae89be2b72e34d119ed4a2aca7b30403032c.tar.gz mv-3529ae89be2b72e34d119ed4a2aca7b30403032c.tar.bz2 mv-3529ae89be2b72e34d119ed4a2aca7b30403032c.tar.xz mv-3529ae89be2b72e34d119ed4a2aca7b30403032c.zip | |
Move chat command /emote into actions.
Diffstat (limited to 'src/input')
| -rw-r--r-- | src/input/inputaction.h | 1 | ||||
| -rw-r--r-- | src/input/inputactionmap.h | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/input/inputaction.h b/src/input/inputaction.h index bb150b867..ef541cbe7 100644 --- a/src/input/inputaction.h +++ b/src/input/inputaction.h @@ -371,6 +371,7 @@ namespace InputAction TARGET, ATTACK_HUMAN, COMMAMD_OUTFIT, + COMMAMD_EMOTE, TOTAL }; } // namespace InputAction diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h index 8c76e65d8..42d664f66 100644 --- a/src/input/inputactionmap.h +++ b/src/input/inputactionmap.h @@ -3108,6 +3108,15 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::INGAME, "outfit", + true}, + {"keyEmote", + InputType::UNKNOWN, InputAction::NO_VALUE, + InputType::UNKNOWN, InputAction::NO_VALUE, + Input::GRP_DEFAULT, + &Actions::commandEmote, + InputAction::NO_VALUE, 50, + InputCondition::INGAME, + "emote", true} }; |