diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-09-26 12:39:08 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-09-26 12:39:08 +0300 |
| commit | a9f4333410bf9ef9448d3868587271b8e948807b (patch) | |
| tree | 69284264cc6bc205e8584445d526b62d8cacc91c /src/input | |
| parent | dfea2f364a0909aec5535e0d17ac7e15ac7419e4 (diff) | |
| download | mv-a9f4333410bf9ef9448d3868587271b8e948807b.tar.gz mv-a9f4333410bf9ef9448d3868587271b8e948807b.tar.bz2 mv-a9f4333410bf9ef9448d3868587271b8e948807b.tar.xz mv-a9f4333410bf9ef9448d3868587271b8e948807b.zip | |
Add action and chat command to fire homunculus.
New chat command: firehomunculus
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/basic.cpp | 6 |
3 files changed, 16 insertions, 0 deletions
diff --git a/src/input/inputaction.h b/src/input/inputaction.h index 36adeda3c..77bed24b7 100644 --- a/src/input/inputaction.h +++ b/src/input/inputaction.h @@ -485,6 +485,7 @@ namespace InputAction TARGET_PET, PET_SET_NAME, HOMUNCULUS_SET_NAME, + HOMUNCULUS_FIRE, TOTAL }; } // namespace InputAction diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h index 6f4d1e32f..a80d443ff 100644 --- a/src/input/inputactionmap.h +++ b/src/input/inputactionmap.h @@ -4106,6 +4106,15 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::INGAME, "sethomunname|homunsetname|sethomunculusname|homunculussetname", + false}, + {"keyHomunculusFire", + InputType::UNKNOWN, InputAction::NO_VALUE, + InputType::UNKNOWN, InputAction::NO_VALUE, + Input::GRP_DEFAULT, + &Actions::fireHomunculus, + InputAction::NO_VALUE, 50, + InputCondition::INGAME, + "firehomunculus|homunculusfire", false} }; diff --git a/src/input/pages/basic.cpp b/src/input/pages/basic.cpp index df573389d..13b3a770c 100644 --- a/src/input/pages/basic.cpp +++ b/src/input/pages/basic.cpp @@ -230,6 +230,12 @@ SetupActionData setupActionDataBasic[] = "", }, { + // TRANSLATORS: input action name + N_("Fire your homunculus"), + InputAction::HOMUNCULUS_FIRE, + "", + }, + { "", InputAction::NO_VALUE, "" |