summaryrefslogtreecommitdiff
path: root/src/input
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-09-23 15:02:35 +0300
committerAndrei Karas <akaras@inbox.ru>2014-09-23 15:02:35 +0300
commite07a6a1cb8cd414f0b0a8de21903cd621582a906 (patch)
tree5058fbac6ee8d57a794cd32b5e93798d8818b406 /src/input
parentab5e3e053a31efdc5799c1239e2bceaacf7cff61 (diff)
downloadmv-e07a6a1cb8cd414f0b0a8de21903cd621582a906.tar.gz
mv-e07a6a1cb8cd414f0b0a8de21903cd621582a906.tar.bz2
mv-e07a6a1cb8cd414f0b0a8de21903cd621582a906.tar.xz
mv-e07a6a1cb8cd414f0b0a8de21903cd621582a906.zip
Add action for targetting pets.
New chat command: targetpet
Diffstat (limited to 'src/input')
-rw-r--r--src/input/inputaction.h1
-rw-r--r--src/input/inputactionmap.h9
-rw-r--r--src/input/pages/basic.cpp6
3 files changed, 16 insertions, 0 deletions
diff --git a/src/input/inputaction.h b/src/input/inputaction.h
index 6ca667f76..422a141ae 100644
--- a/src/input/inputaction.h
+++ b/src/input/inputaction.h
@@ -482,6 +482,7 @@ namespace InputAction
UNIGNORE_WHISPER,
MERCENARY_FIRE,
TARGET_MERCENARY,
+ TARGET_PET,
TOTAL
};
} // namespace InputAction
diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h
index 58ca20e6a..edd9620be 100644
--- a/src/input/inputactionmap.h
+++ b/src/input/inputactionmap.h
@@ -4079,6 +4079,15 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
InputAction::NO_VALUE, 50,
InputCondition::INGAME | InputCondition::NOTARGET,
"targetmercenary",
+ false},
+ {"keyTargetPet",
+ InputType::UNKNOWN, InputAction::NO_VALUE,
+ InputType::UNKNOWN, InputAction::NO_VALUE,
+ Input::GRP_DEFAULT,
+ &Actions::targetPet,
+ InputAction::NO_VALUE, 50,
+ InputCondition::INGAME | InputCondition::NOTARGET,
+ "targetpet",
false}
};
diff --git a/src/input/pages/basic.cpp b/src/input/pages/basic.cpp
index dd1efc0bb..df573389d 100644
--- a/src/input/pages/basic.cpp
+++ b/src/input/pages/basic.cpp
@@ -135,6 +135,12 @@ SetupActionData setupActionDataBasic[] =
},
{
// TRANSLATORS: input action name
+ N_("Target pet"),
+ InputAction::TARGET_PET,
+ "",
+ },
+ {
+ // TRANSLATORS: input action name
N_("Catch pet"),
InputAction::CATCH_PET,
"",