diff options
author | Jared Adams <jaxad0127@gmail.com> | 2009-05-01 14:35:41 -0600 |
---|---|---|
committer | Jared Adams <jaxad0127@gmail.com> | 2009-05-01 14:35:41 -0600 |
commit | 6a7d3f9343f29bd9b46f3bbac917aa190b42b14d (patch) | |
tree | 6de65bfdc540ea9ea1a065b013179f02a968d35d /src/net/ea/beinghandler.cpp | |
parent | b6fb2326ffa687f6028d991e2d6203b3f2a92c5a (diff) | |
download | mana-6a7d3f9343f29bd9b46f3bbac917aa190b42b14d.tar.gz mana-6a7d3f9343f29bd9b46f3bbac917aa190b42b14d.tar.bz2 mana-6a7d3f9343f29bd9b46f3bbac917aa190b42b14d.tar.xz mana-6a7d3f9343f29bd9b46f3bbac917aa190b42b14d.zip |
Merge the NPC dialogs into one
Also add support for the new TMWServ NPC packets
Diffstat (limited to 'src/net/ea/beinghandler.cpp')
-rw-r--r-- | src/net/ea/beinghandler.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp index 65d19040..1f5f79c7 100644 --- a/src/net/ea/beinghandler.cpp +++ b/src/net/ea/beinghandler.cpp @@ -35,12 +35,8 @@ #include "npc.h" #include "playerrelations.h" -#include "gui/npctextdialog.h" - #include <iostream> -extern NpcTextDialog *npcTextDialog; - namespace EAthena { const int EMOTION_TIME = 150; /**< Duration of emotion icon */ @@ -246,9 +242,6 @@ void BeingHandler::handleMessage(MessageIn &msg) // A being should be removed or has died id = msg.readInt32(); - if (id == current_npc) - npcTextDialog->showCloseButton(); - dstBeing = beingManager->findBeing(id); if (!dstBeing) |