diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-08-26 23:35:31 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-08-26 23:35:31 +0300 |
commit | 9f39b5c84d0b244e093380e5ad7d53c2a21d2f34 (patch) | |
tree | 486e3c373fb7a1e572be9b5a71ed95fc6d4b7707 /src/input | |
parent | c7266cda03bcab72b147b5597a126f01f915fe2c (diff) | |
download | plus-9f39b5c84d0b244e093380e5ad7d53c2a21d2f34.tar.gz plus-9f39b5c84d0b244e093380e5ad7d53c2a21d2f34.tar.bz2 plus-9f39b5c84d0b244e093380e5ad7d53c2a21d2f34.tar.xz plus-9f39b5c84d0b244e093380e5ad7d53c2a21d2f34.zip |
Move chat command /serverunignoreall 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/chat.cpp | 6 |
3 files changed, 16 insertions, 0 deletions
diff --git a/src/input/inputaction.h b/src/input/inputaction.h index 572333a3d..cb79d84a2 100644 --- a/src/input/inputaction.h +++ b/src/input/inputaction.h @@ -395,6 +395,7 @@ namespace InputAction ADD_IGNORE_ATTACK, DUMP, SERVER_IGNORE_ALL, + SERVER_UNIGNORE_ALL, TOTAL }; } // namespace InputAction diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h index 82973a0cc..b0976916c 100644 --- a/src/input/inputactionmap.h +++ b/src/input/inputactionmap.h @@ -3324,6 +3324,15 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::INGAME, "serverignoreall", + false}, + {"keyServerUnIgnoreAll", + InputType::UNKNOWN, InputAction::NO_VALUE, + InputType::UNKNOWN, InputAction::NO_VALUE, + Input::GRP_DEFAULT, + &Actions::serverUnIgnoreAll, + InputAction::NO_VALUE, 50, + InputCondition::INGAME, + "serverunignoreall", false} }; diff --git a/src/input/pages/chat.cpp b/src/input/pages/chat.cpp index 27e239cce..749752ab6 100644 --- a/src/input/pages/chat.cpp +++ b/src/input/pages/chat.cpp @@ -92,6 +92,12 @@ SetupActionData setupActionDataChat[] = }, { // TRANSLATORS: input action name + N_("Unignore all whispers on server side"), + InputAction::SERVER_UNIGNORE_ALL, + "", + }, + { + // TRANSLATORS: input action name N_("Previous chat line"), InputAction::CHAT_PREV_HISTORY, "", |