diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-08-27 16:32:44 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-08-27 16:32:44 +0300 |
| commit | 60c983e043b9ec502b65785306887003f5bcb27b (patch) | |
| tree | f563332745eea7bb17fa31046db74364e4183ad4 /src/input | |
| parent | de2e84a86c3419a41de594951c452e25dde60d86 (diff) | |
| download | ManaVerse-60c983e043b9ec502b65785306887003f5bcb27b.tar.gz ManaVerse-60c983e043b9ec502b65785306887003f5bcb27b.tar.bz2 ManaVerse-60c983e043b9ec502b65785306887003f5bcb27b.tar.xz ManaVerse-60c983e043b9ec502b65785306887003f5bcb27b.zip | |
Move chat command /uploadlog into actions.
Diffstat (limited to 'src/input')
| -rw-r--r-- | src/input/inputaction.h | 1 | ||||
| -rw-r--r-- | src/input/inputactionmap.h | 9 | ||||
| -rw-r--r-- | src/input/pages/other.cpp | 6 |
3 files changed, 16 insertions, 0 deletions
diff --git a/src/input/inputaction.h b/src/input/inputaction.h index cf7886bf5..93a3a48a7 100644 --- a/src/input/inputaction.h +++ b/src/input/inputaction.h @@ -420,6 +420,7 @@ namespace InputAction TALK_PET, UPLOAD_CONFIG, UPLOAD_SERVER_CONFIG, + UPLOAD_LOG, TOTAL }; } // namespace InputAction diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h index 1af14ffc7..aa9432b06 100644 --- a/src/input/inputactionmap.h +++ b/src/input/inputactionmap.h @@ -3557,6 +3557,15 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::INGAME, "uploadserverconfig", + false}, + {"keyUploadLog", + InputType::UNKNOWN, InputAction::NO_VALUE, + InputType::UNKNOWN, InputAction::NO_VALUE, + Input::GRP_DEFAULT, + &Actions::uploadLog, + InputAction::NO_VALUE, 50, + InputCondition::INGAME, + "uploadlog", false} }; diff --git a/src/input/pages/other.cpp b/src/input/pages/other.cpp index 6369a509f..9d16f4b8a 100644 --- a/src/input/pages/other.cpp +++ b/src/input/pages/other.cpp @@ -360,6 +360,12 @@ SetupActionData setupActionDataOther[] = "", }, { + // TRANSLATORS: input action name + N_("Upload log file"), + InputAction::UPLOAD_LOG, + "", + }, + { "", InputAction::NO_VALUE, "" |