summaryrefslogtreecommitdiff
path: root/src/actionmanager.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-07-20 12:43:37 +0300
committerAndrei Karas <akaras@inbox.ru>2014-07-20 12:43:37 +0300
commit58f499d3c4c46f2f9e0f129001a1e1311ec330b5 (patch)
treeb22075ebb5360f7633e8e08aaff0e90500ebc38e /src/actionmanager.cpp
parentbfb23727b86d05cbf4190ab1c36d6b32c2b85f77 (diff)
downloadmv-58f499d3c4c46f2f9e0f129001a1e1311ec330b5.tar.gz
mv-58f499d3c4c46f2f9e0f129001a1e1311ec330b5.tar.bz2
mv-58f499d3c4c46f2f9e0f129001a1e1311ec330b5.tar.xz
mv-58f499d3c4c46f2f9e0f129001a1e1311ec330b5.zip
Add ability to switch yellow bar parameters back.
New key combination: stop attack key (left shift) + change yellow bar key
Diffstat (limited to 'src/actionmanager.cpp')
-rw-r--r--src/actionmanager.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/actionmanager.cpp b/src/actionmanager.cpp
index 71e9a48b2..7155e3c2c 100644
--- a/src/actionmanager.cpp
+++ b/src/actionmanager.cpp
@@ -91,7 +91,8 @@
#define callYellowBar(name) \
if (player_node) \
{ \
- player_node->name(true); \
+ player_node->name(!inputManager.isActionActive( \
+ InputAction::STOP_ATTACK)); \
return true; \
} \
return false;
@@ -99,7 +100,8 @@
#define callYellowBarCond(name) \
if (player_node && !player_node->getDisableGameModifiers()) \
{ \
- player_node->name(true); \
+ player_node->name(!inputManager.isActionActive( \
+ InputAction::STOP_ATTACK)); \
return true; \
} \
return false;