diff options
| author | Ira Rice <irarice@gmail.com> | 2009-01-19 21:59:59 +0100 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-01-19 21:59:59 +0100 |
| commit | 3fcd3755f5c5d23af31e081c59275ef94cb4e036 (patch) | |
| tree | d0c8e5f9d733bc68bcdd157eaad1efa5925bfac3 /src/game.cpp | |
| parent | 59cf6979f8e0a86deb0975ef135593b207ffe34a (diff) | |
| download | mana-3fcd3755f5c5d23af31e081c59275ef94cb4e036.tar.gz mana-3fcd3755f5c5d23af31e081c59275ef94cb4e036.tar.bz2 mana-3fcd3755f5c5d23af31e081c59275ef94cb4e036.tar.xz mana-3fcd3755f5c5d23af31e081c59275ef94cb4e036.zip | |
Fixes to the NPC Integer input field
Also don't set "The Mana World" to start with.
Signed-off-by: Ira Rice <irarice@gmail.com>
(cherry picked from Aethyra commit d2b804c1a817ccdd85b4b1220bf929e9d370d774)
Conflicts:
src/game.cpp
src/gui/inttextfield.cpp
src/gui/item_amount.cpp
src/gui/textfield.h
Diffstat (limited to 'src/game.cpp')
| -rw-r--r-- | src/game.cpp | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/src/game.cpp b/src/game.cpp index 1b6f2d5c..6cd94760 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -627,6 +627,26 @@ 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 { @@ -634,7 +654,7 @@ void Game::handleInput() used = true; } break; - // Quitting confirmation dialog + // Quitting confirmation dialog case SDLK_ESCAPE: if (!exitConfirm) { exitConfirm = new ConfirmDialog( |