From b0ab41f03839163549de4344c027a69312458e77 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 25 Aug 2014 23:07:02 +0300
Subject: Move chat command /atkhuman into actions.
---
src/input/inputaction.h | 1 +
src/input/inputactionmap.h | 11 ++++++++++-
src/input/pages/basic.cpp | 8 +++++++-
3 files changed, 18 insertions(+), 2 deletions(-)
(limited to 'src/input')
diff --git a/src/input/inputaction.h b/src/input/inputaction.h
index 7c552b908..32e40227f 100644
--- a/src/input/inputaction.h
+++ b/src/input/inputaction.h
@@ -369,6 +369,7 @@ namespace InputAction
PRINT_ALL,
MOVE,
TARGET,
+ ATTACK_HUMAN,
TOTAL
};
} // namespace InputAction
diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h
index 6e0dbd668..a2bdf214c 100644
--- a/src/input/inputactionmap.h
+++ b/src/input/inputactionmap.h
@@ -3090,7 +3090,16 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
InputAction::NO_VALUE, 50,
InputCondition::INGAME,
"target",
- true}
+ true},
+ {"keyAttackHuman",
+ InputType::UNKNOWN, InputAction::NO_VALUE,
+ InputType::UNKNOWN, InputAction::NO_VALUE,
+ Input::GRP_DEFAULT,
+ &Actions::attackHuman,
+ InputAction::NO_VALUE, 50,
+ InputCondition::INGAME,
+ "atkhuman",
+ false}
};
#endif // INPUT_INPUTACTIONMAP_H
diff --git a/src/input/pages/basic.cpp b/src/input/pages/basic.cpp
index 302cd495d..f91b495de 100644
--- a/src/input/pages/basic.cpp
+++ b/src/input/pages/basic.cpp
@@ -47,10 +47,16 @@ SetupActionData setupActionDataBasic[] =
},
{
// TRANSLATORS: input action name
- N_("Target & Attack"),
+ N_("Target & attack closest monster"),
InputAction::TARGET_ATTACK,
"",
},
+ {
+ // TRANSLATORS: input action name
+ N_("Target & attack closest player"),
+ InputAction::ATTACK_HUMAN,
+ "",
+ },
{
// TRANSLATORS: input action name
N_("Move to Target"),
--
cgit v1.2.3-70-g09d2