summaryrefslogtreecommitdiff
path: root/src/actionmanager.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-07-20 20:58:31 +0300
committerAndrei Karas <akaras@inbox.ru>2014-07-21 00:18:17 +0300
commit744b9d6689b67779a1d17c6d3de7cd016ca1033b (patch)
tree8c7f235ec6ffd1f00bd6865a355be3f731b30395 /src/actionmanager.cpp
parentc42d25a77f5bd7bcd04636abded20452a753fa6d (diff)
downloadmv-744b9d6689b67779a1d17c6d3de7cd016ca1033b.tar.gz
mv-744b9d6689b67779a1d17c6d3de7cd016ca1033b.tar.bz2
mv-744b9d6689b67779a1d17c6d3de7cd016ca1033b.tar.xz
mv-744b9d6689b67779a1d17c6d3de7cd016ca1033b.zip
move "change move" option into gamemodifiers.
Diffstat (limited to 'src/actionmanager.cpp')
-rw-r--r--src/actionmanager.cpp12
1 files changed, 11 insertions, 1 deletions
diff --git a/src/actionmanager.cpp b/src/actionmanager.cpp
index 2d9d366b5..f30fab781 100644
--- a/src/actionmanager.cpp
+++ b/src/actionmanager.cpp
@@ -24,6 +24,7 @@
#include "dropshortcut.h"
#include "emoteshortcut.h"
#include "game.h"
+#include "gamemodifiers.h"
#include "itemshortcut.h"
#include "soundmanager.h"
@@ -97,6 +98,15 @@
} \
return false;
+#define callYellowBar2(name) \
+ if (modifiers) \
+ { \
+ modifiers->name(!inputManager.isActionActive( \
+ InputAction::STOP_ATTACK)); \
+ return true; \
+ } \
+ return false;
+
#define callYellowBarCond(name) \
if (player_node && !player_node->getDisableGameModifiers()) \
{ \
@@ -499,7 +509,7 @@ impHandler0(setHome)
impHandler0(changeMoveType)
{
- callYellowBar(changeMoveType);
+ callYellowBar2(changeMoveType);
}
impHandler0(changeAttackWeaponType)