summaryrefslogtreecommitdiff
path: root/src/game.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2009-10-29 21:08:34 +0200
committerThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2009-10-29 21:44:31 +0100
commitc8bb01e2284b0570872be5f638b640d22ae247c8 (patch)
tree97aeb14f69d422b03f4b509f422239c7da4c9e6c /src/game.cpp
parent58b3097bf80a830f2082e26930d0a0f180f5f40c (diff)
downloadmana-c8bb01e2284b0570872be5f638b640d22ae247c8.tar.gz
mana-c8bb01e2284b0570872be5f638b640d22ae247c8.tar.bz2
mana-c8bb01e2284b0570872be5f638b640d22ae247c8.tar.xz
mana-c8bb01e2284b0570872be5f638b640d22ae247c8.zip
Disable keyboard shortcuts in windows with text input.
Disable items shortcuts in setup window. Disable all shortcuts in ItemAmount window. Reviewed-by: Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>
Diffstat (limited to 'src/game.cpp')
-rw-r--r--src/game.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game.cpp b/src/game.cpp
index 15d70adc..644da530 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -755,7 +755,7 @@ void Game::handleInput()
const int tKey = keyboard.getKeyIndex(event.key.keysym.sym);
// Do not activate shortcuts if tradewindow is visible
- if (!tradeWindow->isVisible())
+ if (!tradeWindow->isVisible() && !setupWindow->isVisible())
{
// Checks if any item shortcut is pressed.
for (int i = KeyboardConfig::KEY_SHORTCUT_1;