diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-07-22 01:41:19 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-07-22 01:41:19 +0300 |
| commit | d569dc78b5b50c0e6cbe84e48164e5774fd36de7 (patch) | |
| tree | abe4bf6e0822fe0d1ee2149f88cd0e6e4452c396 /src/input | |
| parent | aaa50f7ef8de21ea1f32065beb15a7a58faf28a5 (diff) | |
| download | plus-d569dc78b5b50c0e6cbe84e48164e5774fd36de7.tar.gz plus-d569dc78b5b50c0e6cbe84e48164e5774fd36de7.tar.bz2 plus-d569dc78b5b50c0e6cbe84e48164e5774fd36de7.tar.xz plus-d569dc78b5b50c0e6cbe84e48164e5774fd36de7.zip | |
move "change game modifiers" option into gamemodifiers.
Diffstat (limited to 'src/input')
| -rw-r--r-- | src/input/inputmanager.cpp | 3 |
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) |