From e54b8369a982585445c84c8590bdb1c16701763f Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 2 Feb 2015 15:07:22 +0300 Subject: Not allow moving while vending shop enabled. --- src/input/inputmanager.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/input/inputmanager.cpp') 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; -- cgit v1.2.3-60-g2f50