diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-08-27 16:23:06 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-08-27 16:23:06 +0300 |
commit | d69abc43187ded70dce586d793a4dc1dbcd1010d (patch) | |
tree | a69ede97c82ba5dd7b2e2ed53f6dc9f7c221fbb9 /src/input | |
parent | 4455f3a3dd5fa28ef7fc1d1cf6d2bff723c90b47 (diff) | |
download | manaplus-d69abc43187ded70dce586d793a4dc1dbcd1010d.tar.gz manaplus-d69abc43187ded70dce586d793a4dc1dbcd1010d.tar.bz2 manaplus-d69abc43187ded70dce586d793a4dc1dbcd1010d.tar.xz manaplus-d69abc43187ded70dce586d793a4dc1dbcd1010d.zip |
Move chat command /uploadconfig into actions.
Diffstat (limited to 'src/input')
-rw-r--r-- | src/input/inputaction.h | 1 | ||||
-rw-r--r-- | src/input/inputactionmap.h | 11 | ||||
-rw-r--r-- | src/input/pages/other.cpp | 6 |
3 files changed, 17 insertions, 1 deletions
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 @@ -348,6 +348,12 @@ SetupActionData setupActionDataOther[] = }, #endif { + // TRANSLATORS: input action name + N_("Upload main config"), + InputAction::UPLOAD_CONFIG, + "", + }, + { "", InputAction::NO_VALUE, "" |