From b863927543393468a7153775c18ef04a59f20a7f Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 13 Jan 2014 12:12:10 +0300
Subject: allow auto close npc dialog if it almost closed and press moving
 keys.

---
 src/input/inputmanager.cpp | 14 +++++++++++---
 src/input/inputmanager.h   |  6 +++++-
 src/input/keyboarddata.h   |  2 +-
 3 files changed, 17 insertions(+), 5 deletions(-)

(limited to 'src/input')

diff --git a/src/input/inputmanager.cpp b/src/input/inputmanager.cpp
index c8c63dc4f..645bfe351 100644
--- a/src/input/inputmanager.cpp
+++ b/src/input/inputmanager.cpp
@@ -24,11 +24,11 @@
 #include "game.h"
 #include "touchmanager.h"
 
-#include "being/localplayer.h"
-
 #include "input/joystick.h"
 #include "input/keyboardconfig.h"
 #include "input/keyboarddata.h"
+#include "being/localplayer.h"
+#include "being/playerinfo.h"
 #ifdef USE_SDL2
 #include "input/multitouchmanager.h"
 #endif
@@ -340,6 +340,8 @@ bool InputManager::isActionActive(const int index) const
         return false;
 
     const KeyData &key = keyData[index];
+//    logger->log("isActionActive mask=%d, condition=%d, index=%d",
+//        mMask, key.condition, index);
     if ((key.condition & mMask) != key.condition)
         return false;
     return true;
@@ -688,6 +690,12 @@ void InputManager::updateConditionMask()
     const NpcDialog *const dialog = NpcDialog::getActive();
     if (!dialog || !dialog->isTextInputFocused())
         mMask |= COND_NONPCINPUT;
+    if (!dialog || dialog->isCloseState())
+    {
+        mMask |= COND_NONPCDIALOG;
+        if (!InventoryWindow::isStorageActive())
+            mMask |= COND_NOTALKING;
+    }
 
     if (!player_node || !player_node->getDisableGameModifiers())
         mMask |= COND_EMODS;
@@ -706,7 +714,7 @@ void InputManager::updateConditionMask()
 
 bool InputManager::checkKey(const KeyData *const key) const
 {
-//    logger->log("mask=%d, condition=%d", mMask, key->condition);
+    //logger->log("checkKey mask=%d, condition=%d", mMask, key->condition);
     if (!key || (key->condition & mMask) != key->condition)
         return false;
 
diff --git a/src/input/inputmanager.h b/src/input/inputmanager.h
index f781a3e09..ce662611a 100644
--- a/src/input/inputmanager.h
+++ b/src/input/inputmanager.h
@@ -85,11 +85,15 @@ enum KeyCondition
     COND_NOFOLLOW = 1024,                     // follow mode disabled
     COND_INGAME = 2048,                       // game must be started
     COND_NOBUYSELL = 4096,                    // no active buy or sell dialogs
+    COND_NONPCDIALOG = 8192,                  // no active npc dialog or
+                                              // dialog almost closed
+    COND_NOTALKING = 16384,                   // player have no opened
+                                              // dialogs what prevent moving
     COND_SHORTCUT = 2 + 4 + 16 + 512 + 2048,  // flags for shortcut keys
     COND_SHORTCUT0 = 2 + 4 + 16 + 512,        // flags for shortcut keys
     COND_GAME = 2 + 4 + 8 + 16 + 64 + 2048,   // main game key
     COND_GAME2 = 2 + 8 + 16 + 64 + 2048,
-    COND_ARROWKEYS = 2 + 8 + 16 + 64 + 2048 + 4096
+    COND_ARROWKEYS = 2 + 8 + 16 + 64 + 2048 + 4096 + 16384
 };
 
 class InputManager final
diff --git a/src/input/keyboarddata.h b/src/input/keyboarddata.h
index 74278777f..0de9c871e 100644
--- a/src/input/keyboarddata.h
+++ b/src/input/keyboarddata.h
@@ -1974,7 +1974,7 @@ static const KeyData keyData[Input::KEY_TOTAL] = {
         Input::GRP_DEFAULT,
         &ActionManager::moveForward,
         Input::KEY_NO_VALUE, 50,
-        COND_GAME},
+        COND_ARROWKEYS},
     {"keyGUICtrl",
         INPUT_KEYBOARD, SDLK_LCTRL,
         INPUT_UNKNOWN, Input::KEY_NO_VALUE,
-- 
cgit v1.2.3-60-g2f50