summaryrefslogtreecommitdiff
path: root/src/input/inputmanager.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/input/inputmanager.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/input/inputmanager.cpp')
-rw-r--r--src/input/inputmanager.cpp3
1 files changed, 2 insertions, 1 deletions
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)