summaryrefslogtreecommitdiff
path: root/src/game.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-03-01 00:27:01 +0300
committerAndrei Karas <akaras@inbox.ru>2012-03-01 00:27:01 +0300
commit25371488bd2b58892f09798f481e7d4992373b44 (patch)
tree14d69725093d96eafc81e8ad55ce09913032baae /src/game.cpp
parentb3f55809a8a56a5acf180371f05163091263cbda (diff)
downloadmv-25371488bd2b58892f09798f481e7d4992373b44.tar.gz
mv-25371488bd2b58892f09798f481e7d4992373b44.tar.bz2
mv-25371488bd2b58892f09798f481e7d4992373b44.tar.xz
mv-25371488bd2b58892f09798f481e7d4992373b44.zip
Block move/direction shortcuts in inventory/storage input fields.
Diffstat (limited to 'src/game.cpp')
-rw-r--r--src/game.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/game.cpp b/src/game.cpp
index a0c2a6151..33bfe232a 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -1317,7 +1317,8 @@ void Game::handleMoveAndAttack(SDL_Event &event, bool wasDown)
if (player_node->isAlive() && (!Being::isTalking()
|| keyboard.getKeyIndex(event.key.keysym.sym)
== KeyboardConfig::KEY_TALK)
- && chatWindow && !chatWindow->isInputFocused() && !quitDialog)
+ && chatWindow && !chatWindow->isInputFocused()
+ && !InventoryWindow::isAnyInputFocused() && !quitDialog)
{
// Get the state of the keyboard keys
keyboard.refreshActiveKeys();