From a9f4333410bf9ef9448d3868587271b8e948807b Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 26 Sep 2014 12:39:08 +0300 Subject: Add action and chat command to fire homunculus. New chat command: firehomunculus --- src/input/inputaction.h | 1 + src/input/inputactionmap.h | 9 +++++++++ src/input/pages/basic.cpp | 6 ++++++ 3 files changed, 16 insertions(+) (limited to 'src/input') 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 @@ -229,6 +229,12 @@ SetupActionData setupActionDataBasic[] = InputAction::SAFE_VIDEO, "", }, + { + // TRANSLATORS: input action name + N_("Fire your homunculus"), + InputAction::HOMUNCULUS_FIRE, + "", + }, { "", InputAction::NO_VALUE, -- cgit v1.2.3-70-g09d2