summaryrefslogtreecommitdiff
path: root/src/input
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-08-27 16:26:22 +0300
committerAndrei Karas <akaras@inbox.ru>2014-08-27 16:26:22 +0300
commitde2e84a86c3419a41de594951c452e25dde60d86 (patch)
treea791b7d043b1e1574d76cd7d64c34e1afa2b48ed /src/input
parentd69abc43187ded70dce586d793a4dc1dbcd1010d (diff)
downloadmanaverse-de2e84a86c3419a41de594951c452e25dde60d86.tar.gz
manaverse-de2e84a86c3419a41de594951c452e25dde60d86.tar.bz2
manaverse-de2e84a86c3419a41de594951c452e25dde60d86.tar.xz
manaverse-de2e84a86c3419a41de594951c452e25dde60d86.zip
Move chat command /uploadserverconfig 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 3dbd37d27..cf7886bf5 100644
--- a/src/input/inputaction.h
+++ b/src/input/inputaction.h
@@ -419,6 +419,7 @@ namespace InputAction
TALK_RAW,
TALK_PET,
UPLOAD_CONFIG,
+ UPLOAD_SERVER_CONFIG,
TOTAL
};
} // namespace InputAction
diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h
index 5739d8eac..1af14ffc7 100644
--- a/src/input/inputactionmap.h
+++ b/src/input/inputactionmap.h
@@ -3548,6 +3548,15 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
InputAction::NO_VALUE, 50,
InputCondition::INGAME,
"uploadconfig",
+ false},
+ {"keyUploadServerConfig",
+ InputType::UNKNOWN, InputAction::NO_VALUE,
+ InputType::UNKNOWN, InputAction::NO_VALUE,
+ Input::GRP_DEFAULT,
+ &Actions::uploadServerConfig,
+ InputAction::NO_VALUE, 50,
+ InputCondition::INGAME,
+ "uploadserverconfig",
false}
};
diff --git a/src/input/pages/other.cpp b/src/input/pages/other.cpp
index 1f6eea0c8..6369a509f 100644
--- a/src/input/pages/other.cpp
+++ b/src/input/pages/other.cpp
@@ -354,6 +354,12 @@ SetupActionData setupActionDataOther[] =
"",
},
{
+ // TRANSLATORS: input action name
+ N_("Upload server config"),
+ InputAction::UPLOAD_SERVER_CONFIG,
+ "",
+ },
+ {
"",
InputAction::NO_VALUE,
""