summaryrefslogtreecommitdiff
path: root/src/input
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-08-26 23:43:37 +0300
committerAndrei Karas <akaras@inbox.ru>2014-08-26 23:44:11 +0300
commit84edefedf8e3688f618f0dde8169d6ee18624e6e (patch)
treed54e877cdb20ff88f998f4f07647a30fbb738177 /src/input
parent8314a1808ff96ec8990c4d9055cad41c05f07dc2 (diff)
downloadmv-84edefedf8e3688f618f0dde8169d6ee18624e6e.tar.gz
mv-84edefedf8e3688f618f0dde8169d6ee18624e6e.tar.bz2
mv-84edefedf8e3688f618f0dde8169d6ee18624e6e.tar.xz
mv-84edefedf8e3688f618f0dde8169d6ee18624e6e.zip
Move chat command /error 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/other.cpp6
3 files changed, 16 insertions, 0 deletions
diff --git a/src/input/inputaction.h b/src/input/inputaction.h
index d81a66352..aa69f4a19 100644
--- a/src/input/inputaction.h
+++ b/src/input/inputaction.h
@@ -397,6 +397,7 @@ namespace InputAction
SERVER_IGNORE_ALL,
SERVER_UNIGNORE_ALL,
SET_DROP,
+ ERROR,
TOTAL
};
} // namespace InputAction
diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h
index 8f7ec4b73..4b9150aa8 100644
--- a/src/input/inputactionmap.h
+++ b/src/input/inputactionmap.h
@@ -3342,6 +3342,15 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
InputAction::NO_VALUE, 50,
InputCondition::INGAME,
"setdrop",
+ true},
+ {"keyError",
+ InputType::UNKNOWN, InputAction::NO_VALUE,
+ InputType::UNKNOWN, InputAction::NO_VALUE,
+ Input::GRP_DEFAULT,
+ &Actions::error,
+ InputAction::NO_VALUE, 50,
+ InputCondition::INGAME,
+ "error",
false}
};
diff --git a/src/input/pages/other.cpp b/src/input/pages/other.cpp
index 6bafbf8c3..8bae75449 100644
--- a/src/input/pages/other.cpp
+++ b/src/input/pages/other.cpp
@@ -286,6 +286,12 @@ SetupActionData setupActionDataOther[] =
"",
},
{
+ // TRANSLATORS: input action name
+ N_("Crash client"),
+ InputAction::ERROR,
+ "",
+ },
+ {
"",
InputAction::NO_VALUE,
""