diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-08-26 00:02:45 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-08-26 00:02:45 +0300 |
| commit | 1333ccee41e2acca4ecf4a90a6b230e8bbd23f7d (patch) | |
| tree | a7b4c4aef5a3e5f03bb0e5ca38c9d7946275a584 /src/input | |
| parent | 3529ae89be2b72e34d119ed4a2aca7b30403032c (diff) | |
| download | manaplus-1333ccee41e2acca4ecf4a90a6b230e8bbd23f7d.tar.gz manaplus-1333ccee41e2acca4ecf4a90a6b230e8bbd23f7d.tar.bz2 manaplus-1333ccee41e2acca4ecf4a90a6b230e8bbd23f7d.tar.xz manaplus-1333ccee41e2acca4ecf4a90a6b230e8bbd23f7d.zip | |
Move chat command /emotepet 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 ef541cbe7..c58de0c58 100644 --- a/src/input/inputaction.h +++ b/src/input/inputaction.h @@ -372,6 +372,7 @@ namespace InputAction ATTACK_HUMAN, COMMAMD_OUTFIT, COMMAMD_EMOTE, + COMMAND_EMOTE_PET, TOTAL }; } // namespace InputAction diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h index 42d664f66..63dbb622c 100644 --- a/src/input/inputactionmap.h +++ b/src/input/inputactionmap.h @@ -3117,6 +3117,15 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::INGAME, "emote", + true}, + {"keyEmotePet", + InputType::UNKNOWN, InputAction::NO_VALUE, + InputType::UNKNOWN, InputAction::NO_VALUE, + Input::GRP_DEFAULT, + &Actions::commandEmotePet, + InputAction::NO_VALUE, 50, + InputCondition::INGAME, + "emotepet", true} }; |