diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-06-22 20:43:46 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-06-22 20:43:46 +0300 |
| commit | bda7b8cc0776456e8d392be45be9b74183cf0f37 (patch) | |
| tree | a473856f7744dcd2085e6c237ebde1bac2c23ce7 /src/input | |
| parent | 21fb62f9747578a7a81ccfa94369429fba4d4cc1 (diff) | |
| download | manaplus-bda7b8cc0776456e8d392be45be9b74183cf0f37.tar.gz manaplus-bda7b8cc0776456e8d392be45be9b74183cf0f37.tar.bz2 manaplus-bda7b8cc0776456e8d392be45be9b74183cf0f37.tar.xz manaplus-bda7b8cc0776456e8d392be45be9b74183cf0f37.zip | |
Add chat command for move mercenary to master.
Diffstat (limited to 'src/input')
| -rw-r--r-- | src/input/inputactionmap.h | 6 | ||||
| -rw-r--r-- | src/input/pages/move.cpp | 6 |
2 files changed, 12 insertions, 0 deletions
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 @@ -92,6 +92,12 @@ SetupActionData setupActionDataMove[] = }, { // TRANSLATORS: input action name + N_("Move mercenary to master"), + InputAction::MERCENARY_TO_MASTER, + "", + }, + { + // TRANSLATORS: input action name N_("Move to navigation point shortcuts"), InputAction::NO_VALUE, "" |