diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-09 20:19:39 +0100 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-09 21:10:48 +0100 |
| commit | 32bfe1ddf26413fc660bed9ea29765fcabb90eb3 (patch) | |
| tree | 29d0d6274696560b1bb94b762456f4b511f0311b /src/game.cpp | |
| parent | 112d71798eca4b13dd5b11805669ae4fad4dea0e (diff) | |
| parent | d2876ad85935c5d0b181d050bd4c19a4682123b1 (diff) | |
| download | mana-client-32bfe1ddf26413fc660bed9ea29765fcabb90eb3.tar.gz mana-client-32bfe1ddf26413fc660bed9ea29765fcabb90eb3.tar.bz2 mana-client-32bfe1ddf26413fc660bed9ea29765fcabb90eb3.tar.xz mana-client-32bfe1ddf26413fc660bed9ea29765fcabb90eb3.zip | |
Merge branch 'master' of git@gitorious.org:tmw/eathena
Conflicts:
src/game.cpp
src/net/charserverhandler.cpp
src/net/loginhandler.cpp
src/net/protocol.h
Diffstat (limited to 'src/game.cpp')
| -rw-r--r-- | src/game.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/game.cpp b/src/game.cpp index 3b943f6b..03d68a80 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -613,18 +613,6 @@ void Game::handleInput() // Close the config window, cancelling changes if opened else if (setupWindow->isVisible()) 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 { |