diff options
author | Andrei Karas <akaras@inbox.ru> | 2015-02-02 15:07:22 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2015-02-02 22:48:10 +0300 |
commit | e54b8369a982585445c84c8590bdb1c16701763f (patch) | |
tree | 77f4ce5c37ad45f3bc3aa42f644b818025f92af2 /src/input/inputmanager.cpp | |
parent | 610b19c083565f1f6c153fadff80fc0e7475168f (diff) | |
download | mv-e54b8369a982585445c84c8590bdb1c16701763f.tar.gz mv-e54b8369a982585445c84c8590bdb1c16701763f.tar.bz2 mv-e54b8369a982585445c84c8590bdb1c16701763f.tar.xz mv-e54b8369a982585445c84c8590bdb1c16701763f.zip |
Not allow moving while vending shop enabled.
Diffstat (limited to 'src/input/inputmanager.cpp')
-rw-r--r-- | src/input/inputmanager.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/input/inputmanager.cpp b/src/input/inputmanager.cpp index 7500116cf..dcb4b57a7 100644 --- a/src/input/inputmanager.cpp +++ b/src/input/inputmanager.cpp @@ -25,11 +25,13 @@ #include "settings.h" #include "touchmanager.h" +#include "being/localplayer.h" +#include "being/playerinfo.h" + #include "input/inputactionmap.h" #include "input/inputactionsortfunctor.h" #include "input/joystick.h" #include "input/keyboardconfig.h" -#include "being/localplayer.h" #ifdef USE_SDL2 #include "input/multitouchmanager.h" #endif @@ -688,6 +690,9 @@ void InputManager::updateConditionMask() if (!BuyDialog::isActive() && !SellDialog::isActive()) mMask |= InputCondition::NOBUYSELL; + if (!PlayerInfo::isVending()) + mMask |= InputCondition::NOVENDING; + if (!settings.awayMode) mMask |= InputCondition::NOAWAY; |