diff options
| author | Dennis Friis <peavey@placid.dk> | 2008-11-06 01:53:49 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2008-12-13 16:15:34 +0100 |
| commit | 204115b64b1984fd3f0e1b524a24a808581cb80a (patch) | |
| tree | 0d7e9529e468c38c00a5abf40aaa93698ac13083 | |
| parent | ba02a23b63bf0a1fde2194d163ead365d2a4fdf0 (diff) | |
| download | mana-client-204115b64b1984fd3f0e1b524a24a808581cb80a.tar.gz mana-client-204115b64b1984fd3f0e1b524a24a808581cb80a.tar.bz2 mana-client-204115b64b1984fd3f0e1b524a24a808581cb80a.tar.xz mana-client-204115b64b1984fd3f0e1b524a24a808581cb80a.zip | |
Do not activate shortcuts if tradewindow is visible.
Conflicts:
ChangeLog
src/game.cpp
(cherry picked from eAthena client)
| -rw-r--r-- | src/game.cpp | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/game.cpp b/src/game.cpp index df6d5578..3e69c28e 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -595,15 +595,19 @@ void Game::handleInput() && !guildWindow->isWindowFocused()) { 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++) + // Do not activate shortcuts if tradewindow is visible + if (!tradeWindow->isVisible()) { - if (tKey == i) { - itemShortcut->useItem( - i - KeyboardConfig::KEY_SHORTCUT_0); - break; + // 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) { |