summaryrefslogtreecommitdiff
path: root/src/gui/npc_text.cpp
diff options
context:
space:
mode:
authorBjörn Steinbrink <B.Steinbrink@gmx.de>2006-02-01 10:32:43 +0000
committerBjörn Steinbrink <B.Steinbrink@gmx.de>2006-02-01 10:32:43 +0000
commit6bff53b318937999a70d775bb6ecea2b18576e0f (patch)
tree66092571b605344a34c7360bccda50e86bc90b30 /src/gui/npc_text.cpp
parent0e6385c12f325fa77ad57eba9b578de10d505ff7 (diff)
downloadmana-client-6bff53b318937999a70d775bb6ecea2b18576e0f.tar.gz
mana-client-6bff53b318937999a70d775bb6ecea2b18576e0f.tar.bz2
mana-client-6bff53b318937999a70d775bb6ecea2b18576e0f.tar.xz
mana-client-6bff53b318937999a70d775bb6ecea2b18576e0f.zip
Simplified button creation code in some windows. Fixed a bug where the game crashes if there's a message dialog from a npc that no longer exists. Reverted properties to private.
Diffstat (limited to 'src/gui/npc_text.cpp')
-rw-r--r--src/gui/npc_text.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp
index 0769021e..27232f3b 100644
--- a/src/gui/npc_text.cpp
+++ b/src/gui/npc_text.cpp
@@ -76,7 +76,8 @@ NpcTextDialog::action(const std::string& eventId)
{
setText("");
setVisible(false);
- current_npc->nextDialog();
+ if (current_npc)
+ current_npc->nextDialog();
current_npc = 0;
}
}