From d2876ad85935c5d0b181d050bd4c19a4682123b1 Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Thu, 5 Feb 2009 09:31:19 +0100 Subject: Fixed inability to chat while talking to NPCs These checks were meant to allow the keyboard to be used to close the NPC dialogs, however in this form they prevent the user from being able to chat while talking to NPCs. Better make sure the Ok button is focused, so you can use Space to close the NPC dialog. --- src/game.cpp | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/src/game.cpp b/src/game.cpp index 1c4bb538..2ba8f7d7 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -627,26 +627,6 @@ void Game::handleInput() { setupWindow->action(gcn::ActionEvent(NULL, "cancel")); } - // Submits the text and proceeds to the next dialog - else if (npcStringDialog->isVisible()) - { - npcStringDialog->action(gcn::ActionEvent(NULL, "ok")); - } - // Proceed to the next dialog option, or close the window - else if (npcTextDialog->isVisible()) - { - npcTextDialog->action(gcn::ActionEvent(NULL, "ok")); - } - // Choose the currently highlighted dialogue option - else if (npcListDialog->isVisible()) - { - npcListDialog->action(gcn::ActionEvent(NULL, "ok")); - } - // Submits the text and proceeds to the next dialog - else if (npcIntegerDialog->isVisible()) - { - npcIntegerDialog->action(gcn::ActionEvent(NULL, "ok")); - } // Else, open the chat edit box else { -- cgit v1.2.3-60-g2f50