diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-08-26 00:53:29 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-08-26 00:53:29 +0300 |
| commit | e2dddbdd9599b9b1f6a9825ee06d4d3616d9d1dd (patch) | |
| tree | ee5204871bd3fe6bdc5638d7ee95a75ceb8efe95 /src/input | |
| parent | 6e99f459bf4895e41118dbcf00ed3ba027b5b952 (diff) | |
| download | plus-e2dddbdd9599b9b1f6a9825ee06d4d3616d9d1dd.tar.gz plus-e2dddbdd9599b9b1f6a9825ee06d4d3616d9d1dd.tar.bz2 plus-e2dddbdd9599b9b1f6a9825ee06d4d3616d9d1dd.tar.xz plus-e2dddbdd9599b9b1f6a9825ee06d4d3616d9d1dd.zip | |
Move chat command /follow into actions.
Diffstat (limited to 'src/input')
| -rw-r--r-- | src/input/inputaction.h | 1 | ||||
| -rw-r--r-- | src/input/inputactionmap.h | 9 | ||||
| -rw-r--r-- | src/input/pages/basic.cpp | 6 |
3 files changed, 16 insertions, 0 deletions
diff --git a/src/input/inputaction.h b/src/input/inputaction.h index 007d03d66..55310593a 100644 --- a/src/input/inputaction.h +++ b/src/input/inputaction.h @@ -375,6 +375,7 @@ namespace InputAction COMMAND_EMOTE_PET, AWAY_MESSAGE, PSEUDO_AWAY, + FOLLOW, TOTAL }; } // namespace InputAction diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h index 08b8b7c40..e773dffdb 100644 --- a/src/input/inputactionmap.h +++ b/src/input/inputactionmap.h @@ -3144,6 +3144,15 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::INGAME, "pseudoaway", + true}, + {"keyFollow", + InputType::UNKNOWN, InputAction::NO_VALUE, + InputType::UNKNOWN, InputAction::NO_VALUE, + Input::GRP_DEFAULT, + &Actions::follow, + InputAction::NO_VALUE, 50, + InputCondition::INGAME, + "follow", true} }; diff --git a/src/input/pages/basic.cpp b/src/input/pages/basic.cpp index f91b495de..2c784d804 100644 --- a/src/input/pages/basic.cpp +++ b/src/input/pages/basic.cpp @@ -173,6 +173,12 @@ SetupActionData setupActionDataBasic[] = }, { // TRANSLATORS: input action name + N_("Follow selected player"), + InputAction::FOLLOW, + "", + }, + { + // TRANSLATORS: input action name N_("Change Map View Mode"), InputAction::PATHFIND, "", |