summaryrefslogtreecommitdiff
path: root/src/input
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-08-26 22:53:07 +0300
committerAndrei Karas <akaras@inbox.ru>2014-08-26 22:53:07 +0300
commitc7266cda03bcab72b147b5597a126f01f915fe2c (patch)
treea2d216f146f8ad96c1dd066abbef90cd8eb7002a /src/input
parent76fd633b0042f2ab3a161460ee03c1978e7c0db9 (diff)
downloadmv-c7266cda03bcab72b147b5597a126f01f915fe2c.tar.gz
mv-c7266cda03bcab72b147b5597a126f01f915fe2c.tar.bz2
mv-c7266cda03bcab72b147b5597a126f01f915fe2c.tar.xz
mv-c7266cda03bcab72b147b5597a126f01f915fe2c.zip
Move chat command /serverignoreall into actions.
Diffstat (limited to 'src/input')
-rw-r--r--src/input/inputaction.h1
-rw-r--r--src/input/inputactionmap.h9
-rw-r--r--src/input/pages/chat.cpp6
3 files changed, 16 insertions, 0 deletions
diff --git a/src/input/inputaction.h b/src/input/inputaction.h
index 3d5353deb..572333a3d 100644
--- a/src/input/inputaction.h
+++ b/src/input/inputaction.h
@@ -394,6 +394,7 @@ namespace InputAction
REMOVE_ATTACK,
ADD_IGNORE_ATTACK,
DUMP,
+ SERVER_IGNORE_ALL,
TOTAL
};
} // namespace InputAction
diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h
index ff79cafb3..82973a0cc 100644
--- a/src/input/inputactionmap.h
+++ b/src/input/inputactionmap.h
@@ -3315,6 +3315,15 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
InputAction::NO_VALUE, 50,
InputCondition::INGAME,
"dump",
+ false},
+ {"keyServerIgnoreAll",
+ InputType::UNKNOWN, InputAction::NO_VALUE,
+ InputType::UNKNOWN, InputAction::NO_VALUE,
+ Input::GRP_DEFAULT,
+ &Actions::serverIgnoreAll,
+ InputAction::NO_VALUE, 50,
+ InputCondition::INGAME,
+ "serverignoreall",
false}
};
diff --git a/src/input/pages/chat.cpp b/src/input/pages/chat.cpp
index 234892c77..27e239cce 100644
--- a/src/input/pages/chat.cpp
+++ b/src/input/pages/chat.cpp
@@ -86,6 +86,12 @@ SetupActionData setupActionDataChat[] =
},
{
// TRANSLATORS: input action name
+ N_("Ignore all whispers on server side"),
+ InputAction::SERVER_IGNORE_ALL,
+ "",
+ },
+ {
+ // TRANSLATORS: input action name
N_("Previous chat line"),
InputAction::CHAT_PREV_HISTORY,
"",