diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-09-21 17:22:29 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-09-21 17:24:16 +0300 |
| commit | d26b49843ee33ca927cc46edc8cc0bdfe97a903a (patch) | |
| tree | 3edffa15445a159d0533fa86568adfb576bbb32d /src/input | |
| parent | 5b907fc3c1c21f69f1b86d4e3c16990dd2bff757 (diff) | |
| download | manaplus-d26b49843ee33ca927cc46edc8cc0bdfe97a903a.tar.gz manaplus-d26b49843ee33ca927cc46edc8cc0bdfe97a903a.tar.bz2 manaplus-d26b49843ee33ca927cc46edc8cc0bdfe97a903a.tar.xz manaplus-d26b49843ee33ca927cc46edc8cc0bdfe97a903a.zip | |
Add chat command and action for fire mercenary.
New chat command: /firemercenary.
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 2ce0518cc..fa9ff9745 100644 --- a/src/input/inputaction.h +++ b/src/input/inputaction.h @@ -480,6 +480,7 @@ namespace InputAction CATCH_PET, IGNORE_WHISPER, UNIGNORE_WHISPER, + MERCENARY_FIRE, TOTAL }; } // namespace InputAction diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h index 3e95f4291..957c9a36a 100644 --- a/src/input/inputactionmap.h +++ b/src/input/inputactionmap.h @@ -4062,6 +4062,15 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputCondition::INGAME, "serverunignore", false}, + {"keyMercenaryFire", + InputType::UNKNOWN, InputAction::NO_VALUE, + InputType::UNKNOWN, InputAction::NO_VALUE, + Input::GRP_DEFAULT, + &Actions::mercenaryFire, + InputAction::NO_VALUE, 50, + InputCondition::INGAME, + "mercenaryfire|firemercenary", + false} }; #endif // INPUT_INPUTACTIONMAP_H diff --git a/src/input/pages/other.cpp b/src/input/pages/other.cpp index 3994b00f5..4077b13bc 100644 --- a/src/input/pages/other.cpp +++ b/src/input/pages/other.cpp @@ -364,6 +364,12 @@ SetupActionData setupActionDataOther[] = "", }, { + // TRANSLATORS: input action name + N_("Fire your mercenary"), + InputAction::MERCENARY_FIRE, + "", + }, + { "", InputAction::NO_VALUE, "" |