From bda7b8cc0776456e8d392be45be9b74183cf0f37 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 22 Jun 2017 20:43:46 +0300 Subject: Add chat command for move mercenary to master. --- src/input/inputactionmap.h | 6 ++++++ src/input/pages/move.cpp | 6 ++++++ 2 files changed, 12 insertions(+) (limited to 'src/input') diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h index 0de10a4e4..cfee0245f 100644 --- a/src/input/inputactionmap.h +++ b/src/input/inputactionmap.h @@ -5696,6 +5696,12 @@ static const InputActionData inputActionData "serverinfo|infoserver", UseArgs_false, Protected_false}, + {"keyMercenaryToMaster", + defaultAction(&Actions::mercenaryToMaster), + InputCondition::INGAME, + "mercenarytomaster|mercmaster", + UseArgs_false, + Protected_false}, }; #undef defaultAction diff --git a/src/input/pages/move.cpp b/src/input/pages/move.cpp index bbee36954..0c0102d9d 100644 --- a/src/input/pages/move.cpp +++ b/src/input/pages/move.cpp @@ -90,6 +90,12 @@ SetupActionData setupActionDataMove[] = InputAction::PET_MOVE_RIGHT, "", }, + { + // TRANSLATORS: input action name + N_("Move mercenary to master"), + InputAction::MERCENARY_TO_MASTER, + "", + }, { // TRANSLATORS: input action name N_("Move to navigation point shortcuts"), -- cgit v1.2.3-70-g09d2