summaryrefslogtreecommitdiff
path: root/src/input
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-06-22 21:13:07 +0300
committerAndrei Karas <akaras@inbox.ru>2017-06-22 21:13:07 +0300
commit1e7d0d8e9873283a0ec09a62e579b718c3c06e51 (patch)
treef54c3317f1d3fe70cfc2634dba7b0a7744270ece /src/input
parentbda7b8cc0776456e8d392be45be9b74183cf0f37 (diff)
downloadmv-1e7d0d8e9873283a0ec09a62e579b718c3c06e51.tar.gz
mv-1e7d0d8e9873283a0ec09a62e579b718c3c06e51.tar.bz2
mv-1e7d0d8e9873283a0ec09a62e579b718c3c06e51.tar.xz
mv-1e7d0d8e9873283a0ec09a62e579b718c3c06e51.zip
Add chat command for move homunculus to master.
Diffstat (limited to 'src/input')
-rw-r--r--src/input/inputactionmap.h6
-rw-r--r--src/input/pages/move.cpp6
2 files changed, 12 insertions, 0 deletions
diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h
index cfee0245f..dc2a38e7d 100644
--- a/src/input/inputactionmap.h
+++ b/src/input/inputactionmap.h
@@ -5702,6 +5702,12 @@ static const InputActionData inputActionData
"mercenarytomaster|mercmaster",
UseArgs_false,
Protected_false},
+ {"keyHomunculusToMaster",
+ defaultAction(&Actions::homunculusToMaster),
+ InputCondition::INGAME,
+ "homunculustomaster|homunmaster",
+ UseArgs_false,
+ Protected_false},
};
#undef defaultAction
diff --git a/src/input/pages/move.cpp b/src/input/pages/move.cpp
index 0c0102d9d..8df8a2c5d 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 homunculus to master"),
+ InputAction::HOMUNCULUS_TO_MASTER,
+ "",
+ },
+ {
+ // TRANSLATORS: input action name
N_("Move mercenary to master"),
InputAction::MERCENARY_TO_MASTER,
"",