summaryrefslogtreecommitdiff
path: root/src/game.cpp
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2010-01-10 21:14:37 +0000
committerJared Adams <jaxad0127@gmail.com>2010-01-10 21:14:37 +0000
commit34917f8ff44b0224f7199e7f1ffd55ba588a9cf7 (patch)
tree731bc31b53ceda93010e4fd26cfe0bf594cb70e3 /src/game.cpp
parent4c6165ece76dff406d324c240a7fc099a3e0c42b (diff)
downloadmana-34917f8ff44b0224f7199e7f1ffd55ba588a9cf7.tar.gz
mana-34917f8ff44b0224f7199e7f1ffd55ba588a9cf7.tar.bz2
mana-34917f8ff44b0224f7199e7f1ffd55ba588a9cf7.tar.xz
mana-34917f8ff44b0224f7199e7f1ffd55ba588a9cf7.zip
Make sure TextDialogs get input precedence
Diffstat (limited to 'src/game.cpp')
-rw-r--r--src/game.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/game.cpp b/src/game.cpp
index 3ef07dca..c9686232 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -64,6 +64,7 @@
#include "gui/setup.h"
#include "gui/skilldialog.h"
#include "gui/statuswindow.h"
+#include "gui/textdialog.h"
#include "gui/trade.h"
#include "gui/viewport.h"
#include "gui/windowmenu.h"
@@ -523,7 +524,8 @@ void Game::handleInput()
}
// send straight to gui for certain windows
- if (quitDialog || npcPostDialog->isVisible())
+ if (quitDialog || TextDialog::isActive() ||
+ npcPostDialog->isVisible())
{
try
{