From d69abc43187ded70dce586d793a4dc1dbcd1010d Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 27 Aug 2014 16:23:06 +0300 Subject: Move chat command /uploadconfig into actions. --- src/input/inputaction.h | 1 + src/input/inputactionmap.h | 11 ++++++++++- src/input/pages/other.cpp | 6 ++++++ 3 files changed, 17 insertions(+), 1 deletion(-) (limited to 'src/input') diff --git a/src/input/inputaction.h b/src/input/inputaction.h index c7296258d..3dbd37d27 100644 --- a/src/input/inputaction.h +++ b/src/input/inputaction.h @@ -418,6 +418,7 @@ namespace InputAction CREATE_ITEMS, TALK_RAW, TALK_PET, + UPLOAD_CONFIG, TOTAL }; } // namespace InputAction diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h index 33d1a3826..5739d8eac 100644 --- a/src/input/inputactionmap.h +++ b/src/input/inputactionmap.h @@ -3530,7 +3530,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::INGAME, "talkraw", - false}, + true}, {"keyTalkPet", InputType::UNKNOWN, InputAction::NO_VALUE, InputType::UNKNOWN, InputAction::NO_VALUE, @@ -3539,6 +3539,15 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::INGAME, "talkpet", + true}, + {"keyUploadConfig", + InputType::UNKNOWN, InputAction::NO_VALUE, + InputType::UNKNOWN, InputAction::NO_VALUE, + Input::GRP_DEFAULT, + &Actions::uploadConfig, + InputAction::NO_VALUE, 50, + InputCondition::INGAME, + "uploadconfig", false} }; diff --git a/src/input/pages/other.cpp b/src/input/pages/other.cpp index a86d13860..1f6eea0c8 100644 --- a/src/input/pages/other.cpp +++ b/src/input/pages/other.cpp @@ -347,6 +347,12 @@ SetupActionData setupActionDataOther[] = "", }, #endif + { + // TRANSLATORS: input action name + N_("Upload main config"), + InputAction::UPLOAD_CONFIG, + "", + }, { "", InputAction::NO_VALUE, -- cgit v1.2.3-60-g2f50