diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2010-01-19 16:33:07 +0000 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2010-01-19 16:33:46 +0000 |
| commit | 3fb3480ef461c7fa2e1f44142f4d37d80d87e087 (patch) | |
| tree | 452ae800f9dcfbb4f7e5787aaabf413f8583a274 /src | |
| parent | b823889f1747bbceb61273f7a7383580c4b034e3 (diff) | |
| download | mana-3fb3480ef461c7fa2e1f44142f4d37d80d87e087.tar.gz mana-3fb3480ef461c7fa2e1f44142f4d37d80d87e087.tar.bz2 mana-3fb3480ef461c7fa2e1f44142f4d37d80d87e087.tar.xz mana-3fb3480ef461c7fa2e1f44142f4d37d80d87e087.zip | |
Fix problems when dying with an NPC dialog open
Diffstat (limited to 'src')
| -rw-r--r-- | src/net/ea/playerhandler.cpp | 3 | ||||
| -rw-r--r-- | src/npc.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp index d7b8594e..3a0a2fe2 100644 --- a/src/net/ea/playerhandler.cpp +++ b/src/net/ea/playerhandler.cpp @@ -30,6 +30,7 @@ #include "gui/buy.h" #include "gui/buysell.h" #include "gui/gui.h" +#include "gui/npcdialog.h" #include "gui/okdialog.h" #include "gui/sell.h" #include "gui/statuswindow.h" @@ -87,6 +88,8 @@ namespace { if (storageWindow->isVisible()) storageWindow->close(); viewport->closePopupMenu(); + npcDialog->closeDialog(); + current_npc = 0; } } deathListener; @@ -54,7 +54,7 @@ class NPC : public Player /** We consider NPCs (at least for now) to be one layer-sprites */ virtual int getNumberOfLayers() const { return 1; } - + static const bool isTalking(); protected: |