From d569dc78b5b50c0e6cbe84e48164e5774fd36de7 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 22 Jul 2014 01:41:19 +0300
Subject: move "change game modifiers" option into gamemodifiers.

---
 src/actionmanager.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/actionmanager.cpp')

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;
-- 
cgit v1.2.3-70-g09d2