From 567d35731d8cca0e535f23652b8fbe050a629f91 Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Tue, 29 Apr 2008 09:10:43 +0000 Subject: * Fixed issue with determining whether chat input is focused (method no longer virtual). * Fixed sometimes rendering with the wrong font. * Fixed warnings about hiding virtual method, Window now always deletes its children (the option not to do so was never used anyway). --- src/game.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/game.cpp') diff --git a/src/game.cpp b/src/game.cpp index 9bfdea9a..e66902d9 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -559,7 +559,7 @@ void Game::handleInput() case SDLK_RETURN: // Input chat window - if (chatWindow->isFocused() || + if (chatWindow->isInputFocused() || deathNotice != NULL || weightNotice != NULL) { @@ -605,7 +605,7 @@ void Game::handleInput() default: break; } - if (keyboard.isEnabled() && !chatWindow->isFocused()) + if (keyboard.isEnabled() && !chatWindow->isInputFocused()) { const int tKey = keyboard.getKeyIndex(event.key.keysym.sym); // Checks if any item shortcut is pressed. @@ -655,7 +655,7 @@ void Game::handleInput() break; case KeyboardConfig::KEY_HIDE_WINDOWS: // Hide certain windows - if (!chatWindow->isFocused()) + if (!chatWindow->isInputFocused()) { statusWindow->setVisible(false); inventoryWindow->setVisible(false); @@ -710,7 +710,7 @@ void Game::handleInput() // Moving player around if (player_node->mAction != Being::DEAD && current_npc == 0 && - !chatWindow->isFocused()) + !chatWindow->isInputFocused()) { // Get the state of the keyboard keys keyboard.refreshActiveKeys(); -- cgit v1.2.3-70-g09d2