summaryrefslogtreecommitdiff
path: root/src/input
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-10-09 21:29:44 +0300
committerAndrei Karas <akaras@inbox.ru>2015-10-09 21:29:44 +0300
commitb04e6dda4c7a4d6996d730e97f99c3ac9d4fdcd5 (patch)
treee0cb051772ba48c804a56b3f770256b6c9a1db68 /src/input
parent7e19951e61f7b9647afee74a9b8e49863e0f4e95 (diff)
downloadmv-b04e6dda4c7a4d6996d730e97f99c3ac9d4fdcd5.tar.gz
mv-b04e6dda4c7a4d6996d730e97f99c3ac9d4fdcd5.tar.bz2
mv-b04e6dda4c7a4d6996d730e97f99c3ac9d4fdcd5.tar.xz
mv-b04e6dda4c7a4d6996d730e97f99c3ac9d4fdcd5.zip
Fix conditions for magic and human attack actions.
Diffstat (limited to 'src/input')
-rw-r--r--src/input/inputactionmap.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h
index b3ac8adb5..3add96c4f 100644
--- a/src/input/inputactionmap.h
+++ b/src/input/inputactionmap.h
@@ -2195,7 +2195,8 @@ static const InputActionData inputActionData
Input::GRP_DEFAULT,
&Actions::magicAttack,
InputAction::NO_VALUE, 50,
- InputCondition::GAME | InputCondition::VALIDSPEED,
+ InputCondition::GAME | InputCondition::NOFOLLOW
+ | InputCondition::VALIDSPEED,
"magicattack",
UseArgs_false},
{"keySwitchMagicAttack",
@@ -2932,7 +2933,8 @@ static const InputActionData inputActionData
UseArgs_true},
{"keyAttackHuman",
defaultAction(&Actions::attackHuman),
- InputCondition::INGAME,
+ InputCondition::GAME | InputCondition::NOFOLLOW
+ | InputCondition::VALIDSPEED,
"atkhuman",
UseArgs_false},
{"keyOutfit",