From d26b49843ee33ca927cc46edc8cc0bdfe97a903a Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 21 Sep 2014 17:22:29 +0300 Subject: Add chat command and action for fire mercenary. New chat command: /firemercenary. --- src/input/inputaction.h | 1 + src/input/inputactionmap.h | 9 +++++++++ src/input/pages/other.cpp | 6 ++++++ 3 files changed, 16 insertions(+) (limited to 'src/input') 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 @@ -363,6 +363,12 @@ SetupActionData setupActionDataOther[] = InputAction::UPLOAD_LOG, "", }, + { + // TRANSLATORS: input action name + N_("Fire your mercenary"), + InputAction::MERCENARY_FIRE, + "", + }, { "", InputAction::NO_VALUE, -- cgit v1.2.3-70-g09d2