summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--src/game.cpp21
2 files changed, 16 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 0bc68213..59b78674 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-11-06 Dennis Friis <peavey@placid.dk>
+
+ * src/game.cpp: Do not activate shortcuts if tradewindow is visible.
+
2008-11-04 Bjørn Lindeijer <bjorn@lindeijer.nl>
* src/gui/gui.cpp, data/graphics/gui/sansserif8.png: Applied more
diff --git a/src/game.cpp b/src/game.cpp
index 3e3cb4b5..fc9183d4 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -664,15 +664,18 @@ void Game::handleInput()
if (keyboard.isEnabled() && !chatWindow->isInputFocused())
{
const int tKey = keyboard.getKeyIndex(event.key.keysym.sym);
- // Checks if any item shortcut is pressed.
- for (int i = KeyboardConfig::KEY_SHORTCUT_0;
- i <= KeyboardConfig::KEY_SHORTCUT_9;
- i++)
- {
- if (tKey == i && !used) {
- itemShortcut->useItem(
- i - KeyboardConfig::KEY_SHORTCUT_0);
- break;
+ // Do not activate shortcuts if tradewindow is visible
+ if (!tradeWindow->isVisible())
+ // Checks if any item shortcut is pressed.
+ for (int i = KeyboardConfig::KEY_SHORTCUT_0;
+ i <= KeyboardConfig::KEY_SHORTCUT_9;
+ i++)
+ {
+ if (tKey == i && !used) {
+ itemShortcut->useItem(
+ i - KeyboardConfig::KEY_SHORTCUT_0);
+ break;
+ }
}
}
switch (tKey) {