summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-02-05 09:31:19 +0100
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-02-05 11:35:45 +0100
commitd2876ad85935c5d0b181d050bd4c19a4682123b1 (patch)
tree588947a182b645e0724828862141d5e0184dbd54
parente6d4a7e4dba7efda4ce06b8410ee31086b54c920 (diff)
downloadmana-d2876ad85935c5d0b181d050bd4c19a4682123b1.tar.gz
mana-d2876ad85935c5d0b181d050bd4c19a4682123b1.tar.bz2
mana-d2876ad85935c5d0b181d050bd4c19a4682123b1.tar.xz
mana-d2876ad85935c5d0b181d050bd4c19a4682123b1.zip
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.
-rw-r--r--src/game.cpp20
1 files changed, 0 insertions, 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
{