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/input/inputmanager.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/input')

diff --git a/src/input/inputmanager.cpp b/src/input/inputmanager.cpp
index 22ea7f85b..f8d3f7505 100644
--- a/src/input/inputmanager.cpp
+++ b/src/input/inputmanager.cpp
@@ -22,6 +22,7 @@
 
 #include "configuration.h"
 #include "game.h"
+#include "settings.h"
 #include "touchmanager.h"
 
 #include "input/inputactionmap.h"
@@ -674,7 +675,7 @@ void InputManager::updateConditionMask()
             mMask |= InputCondition::NOTALKING;
     }
 
-    if (!player_node || !player_node->getDisableGameModifiers())
+    if (!settings.disableGameModifiers)
         mMask |= InputCondition::EMODS;
 
     if (!isActionActive0(InputAction::STOP_ATTACK)
-- 
cgit v1.2.3-70-g09d2