diff options
| author | David Athay <ko2fan@gmail.com> | 2008-03-05 14:37:52 +0000 |
|---|---|---|
| committer | David Athay <ko2fan@gmail.com> | 2008-03-05 14:37:52 +0000 |
| commit | 8d2f8756b0e85f14b5d80ec63dc5e5a7f5f5de3d (patch) | |
| tree | 5dcb0df1685c542063323621f5212a81a3c08761 /src/game.cpp | |
| parent | e063ed2b10f1eae5b592e3edb2116f50f7395b55 (diff) | |
| download | mana-8d2f8756b0e85f14b5d80ec63dc5e5a7f5f5de3d.tar.gz mana-8d2f8756b0e85f14b5d80ec63dc5e5a7f5f5de3d.tar.bz2 mana-8d2f8756b0e85f14b5d80ec63dc5e5a7f5f5de3d.tar.xz mana-8d2f8756b0e85f14b5d80ec63dc5e5a7f5f5de3d.zip | |
Fixed typing in guild dialogs
Diffstat (limited to 'src/game.cpp')
| -rw-r--r-- | src/game.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/game.cpp b/src/game.cpp index 72350122..e07a70bd 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -509,7 +509,7 @@ void Game::handleInput() { break; } - + // Don not focus chat input when quit dialog is active if(quitDialog != NULL && quitDialog->isVisible()) break; @@ -524,6 +524,10 @@ void Game::handleInput() { setupWindow->action(gcn::ActionEvent(NULL, "cancel")); } + else if (guildWindow->isVisible()) + { + // TODO: Check if a dialog is open and close it if so + } // Else, open the chat edit box else { @@ -547,7 +551,7 @@ void Game::handleInput() break; } - if (keyboard.isEnabled() && !chatWindow->isFocused()) + if (keyboard.isEnabled() && !chatWindow->isFocused() && !guildWindow->isFocused()) { const int tKey = keyboard.getKeyIndex(event.key.keysym.sym); // Checks if any item shortcut is pressed. |