From 58f499d3c4c46f2f9e0f129001a1e1311ec330b5 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 20 Jul 2014 12:43:37 +0300 Subject: Add ability to switch yellow bar parameters back. New key combination: stop attack key (left shift) + change yellow bar key --- src/actionmanager.cpp | 6 ++++-- 1 file 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; -- cgit v1.2.3-60-g2f50