summaryrefslogtreecommitdiff
path: root/src/input
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-08-25 23:07:02 +0300
committerAndrei Karas <akaras@inbox.ru>2014-08-25 23:07:02 +0300
commitb0ab41f03839163549de4344c027a69312458e77 (patch)
tree2e7d8ec9a61dd23c667f7967b52971cd297624ec /src/input
parent53fce496581e70f0d99bf91152cc6d7e802e0974 (diff)
downloadmv-b0ab41f03839163549de4344c027a69312458e77.tar.gz
mv-b0ab41f03839163549de4344c027a69312458e77.tar.bz2
mv-b0ab41f03839163549de4344c027a69312458e77.tar.xz
mv-b0ab41f03839163549de4344c027a69312458e77.zip
Move chat command /atkhuman into actions.
Diffstat (limited to 'src/input')
-rw-r--r--src/input/inputaction.h1
-rw-r--r--src/input/inputactionmap.h11
-rw-r--r--src/input/pages/basic.cpp8
3 files changed, 18 insertions, 2 deletions
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,12 +47,18 @@ 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"),
InputAction::MOVE_TO_TARGET,
"",