summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugenio Favalli <elvenprogrammer@gmail.com>2006-12-12 17:29:28 +0000
committerEugenio Favalli <elvenprogrammer@gmail.com>2006-12-12 17:29:28 +0000
commit1ccc963719897ca290104f42adc9c37b792feb7a (patch)
tree5f45e8bf4c400dad89f28484c5ca8062c2cbef11
parent9f04812d686a7a8af1d8384034033221c974798b (diff)
downloadmana-client-1ccc963719897ca290104f42adc9c37b792feb7a.tar.gz
mana-client-1ccc963719897ca290104f42adc9c37b792feb7a.tar.bz2
mana-client-1ccc963719897ca290104f42adc9c37b792feb7a.tar.xz
mana-client-1ccc963719897ca290104f42adc9c37b792feb7a.zip
Hide all NPC dialogs after death
-rw-r--r--ChangeLog1
-rw-r--r--src/net/playerhandler.cpp11
2 files changed, 12 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 9ebf9d4f..b859a822 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@
* src/net/playerhandler.cpp: Fixed crash when selecting an item after
death.
* data/items.xml: Fixed defense values for sweaters.
+ * src/net/playerhandler.cpp: Hide all NPC dialogs after death.
2006-12-12 Bjørn Lindeijer <bjorn@lindeijer.nl>
diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp
index b04778f9..42c21774 100644
--- a/src/net/playerhandler.cpp
+++ b/src/net/playerhandler.cpp
@@ -31,9 +31,12 @@
#include "../log.h"
#include "../npc.h"
+#include "../gui/buy.h"
#include "../gui/chat.h"
#include "../gui/npclistdialog.h"
+#include "../gui/npc_text.h"
#include "../gui/ok_dialog.h"
+#include "../gui/sell.h"
#include "../gui/skill.h"
// TODO Move somewhere else
@@ -41,6 +44,10 @@ OkDialog *weightNotice = NULL;
OkDialog *deathNotice = NULL;
extern NpcListDialog *npcListDialog;
+extern NpcTextDialog *npcTextDialog;
+extern BuyDialog *buyDialog;
+extern SellDialog *sellDialog;
+extern Window *buySellDialog;
/**
* Listener used for handling the overweigth message.
@@ -68,6 +75,10 @@ namespace {
player_node->revive();
deathNotice = NULL;
npcListDialog->setVisible(false);
+ npcTextDialog->setVisible(false);
+ buyDialog->setVisible(false);
+ sellDialog->setVisible(false);
+ buySellDialog->setVisible(false);
current_npc = 0;
}
} deathListener;