diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-08-26 21:29:18 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-08-26 21:29:18 +0300 |
| commit | 17a96c972cd483fa556a79c4cd60e5d7490177a4 (patch) | |
| tree | fc745dec71523b49428838582a5aa40712538140 /src/input | |
| parent | c06c787acceec22845f023b2f849858d36af6585 (diff) | |
| download | manaplus-17a96c972cd483fa556a79c4cd60e5d7490177a4.tar.gz manaplus-17a96c972cd483fa556a79c4cd60e5d7490177a4.tar.bz2 manaplus-17a96c972cd483fa556a79c4cd60e5d7490177a4.tar.xz manaplus-17a96c972cd483fa556a79c4cd60e5d7490177a4.zip | |
Move chat command /uptime 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 ec410f8f0..028b384bb 100644 --- a/src/input/inputaction.h +++ b/src/input/inputaction.h @@ -388,6 +388,7 @@ namespace InputAction DIRS, INFO, WAIT, + UPTIME, TOTAL }; } // namespace InputAction diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h index 7a7b148cd..ce06d13fe 100644 --- a/src/input/inputactionmap.h +++ b/src/input/inputactionmap.h @@ -3261,7 +3261,16 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::INGAME, "wait", - true} + true}, + {"keyUptime", + InputType::UNKNOWN, InputAction::NO_VALUE, + InputType::UNKNOWN, InputAction::NO_VALUE, + Input::GRP_DEFAULT, + &Actions::uptime, + InputAction::NO_VALUE, 50, + InputCondition::INGAME, + "uptime", + false}, }; #endif // INPUT_INPUTACTIONMAP_H diff --git a/src/input/pages/other.cpp b/src/input/pages/other.cpp index f730db629..4931c1216 100644 --- a/src/input/pages/other.cpp +++ b/src/input/pages/other.cpp @@ -274,6 +274,12 @@ SetupActionData setupActionDataOther[] = "", }, { + // TRANSLATORS: input action name + N_("Print client uptime in chat"), + InputAction::UPTIME, + "", + }, + { "", InputAction::NO_VALUE, "" |