diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-08-23 20:34:25 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-08-23 20:34:25 +0300 |
commit | 051b5fc10eaec4f4aec1de8e79f2feae60f0e084 (patch) | |
tree | 16d14e76fa3654b99646fcf95bd91252429a05e8 /src/input | |
parent | 0bda5a9018bb8a8b0511e86d6b0790a5b5127e42 (diff) | |
download | plus-051b5fc10eaec4f4aec1de8e79f2feae60f0e084.tar.gz plus-051b5fc10eaec4f4aec1de8e79f2feae60f0e084.tar.bz2 plus-051b5fc10eaec4f4aec1de8e79f2feae60f0e084.tar.xz plus-051b5fc10eaec4f4aec1de8e79f2feae60f0e084.zip |
Move chat command /where 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/other.cpp | 6 |
3 files changed, 16 insertions, 0 deletions
diff --git a/src/input/inputaction.h b/src/input/inputaction.h index 365f11571..f0f999d2e 100644 --- a/src/input/inputaction.h +++ b/src/input/inputaction.h @@ -345,6 +345,7 @@ namespace InputAction IGNORE_ALL_WHISPERS, CHAT_ANNOUNCE, IPC_TOGGLE, + WHERE, TOTAL }; } // namespace InputAction diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h index b1807760d..241ed632a 100644 --- a/src/input/inputactionmap.h +++ b/src/input/inputactionmap.h @@ -2874,6 +2874,15 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::INGAME, "ipctoggle", + false}, + {"keyWhere", + InputType::UNKNOWN, InputAction::NO_VALUE, + InputType::UNKNOWN, InputAction::NO_VALUE, + Input::GRP_DEFAULT, + &Actions::where, + InputAction::NO_VALUE, 50, + InputCondition::INGAME, + "where", false} }; diff --git a/src/input/pages/other.cpp b/src/input/pages/other.cpp index 70b6b95d5..d1a7d0bfd 100644 --- a/src/input/pages/other.cpp +++ b/src/input/pages/other.cpp @@ -197,6 +197,12 @@ SetupActionData setupActionDataOther[] = }, { // TRANSLATORS: input action name + N_("Show information about position in chat"), + InputAction::WHERE, + "", + }, + { + // TRANSLATORS: input action name N_("Show onscreen keyboard"), InputAction::SHOW_KEYBOARD, "", |