summaryrefslogtreecommitdiff
path: root/src/actionmanager.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-07-22 01:41:19 +0300
committerAndrei Karas <akaras@inbox.ru>2014-07-22 01:41:19 +0300
commitd569dc78b5b50c0e6cbe84e48164e5774fd36de7 (patch)
treeabe4bf6e0822fe0d1ee2149f88cd0e6e4452c396 /src/actionmanager.cpp
parentaaa50f7ef8de21ea1f32065beb15a7a58faf28a5 (diff)
downloadmv-d569dc78b5b50c0e6cbe84e48164e5774fd36de7.tar.gz
mv-d569dc78b5b50c0e6cbe84e48164e5774fd36de7.tar.bz2
mv-d569dc78b5b50c0e6cbe84e48164e5774fd36de7.tar.xz
mv-d569dc78b5b50c0e6cbe84e48164e5774fd36de7.zip
move "change game modifiers" option into gamemodifiers.
Diffstat (limited to 'src/actionmanager.cpp')
-rw-r--r--src/actionmanager.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/actionmanager.cpp b/src/actionmanager.cpp
index e46517a96..9aed163d6 100644
--- a/src/actionmanager.cpp
+++ b/src/actionmanager.cpp
@@ -26,6 +26,7 @@
#include "game.h"
#include "gamemodifiers.h"
#include "itemshortcut.h"
+#include "settings.h"
#include "soundmanager.h"
#include "being/attributes.h"
@@ -99,7 +100,7 @@
return false;
#define callYellowBarCond(name) \
- if (modifiers && !player_node->getDisableGameModifiers()) \
+ if (modifiers && !settings.disableGameModifiers) \
{ \
modifiers->name(!inputManager.isActionActive( \
InputAction::STOP_ATTACK)); \
@@ -562,7 +563,7 @@ impHandler0(changeGameModifier)
{
if (player_node)
{
- player_node->switchGameModifiers();
+ modifiers->changeGameModifiers();
return true;
}
return false;