Fix handling of next and close packets

If we aren't talking with the NPC that they originate from, just send
off the next dialog packet, as empty dialogs don't help. This prevents
problems with ivisible NPCs that just send close (which was ignored by
older clients anyways).

1 files changed, 15 insertions, 5 deletions

diff --git a/src/net/npchandler.cpp b/src/net/npchandler.cpp
index a6dc216b..5ae2ac2e 100644
--- a/src/net/npchandler.cpp
+++ b/src/net/npchandler.cpp
@@ -54,6 +54,7 @@ NPCHandler::NPCHandler()
 void NPCHandler::handleMessage(MessageIn *msg)
 {
     int id;
+    NPC *temporaryNPC;
 
     switch (msg->getId())
     {
@@ -78,15 +79,24 @@ void NPCHandler::handleMessage(MessageIn *msg)
 
          case SMSG_NPC_CLOSE:
             id = msg->readInt32();
-            current_npc = dynamic_cast<NPC*>(beingManager->findBeing(id));
-            npcTextDialog->showCloseButton();
+            temporaryNPC = dynamic_cast<NPC*>(beingManager->findBeing(id));
+            // If we're talking to that NPC, show the close button
+            if (temporaryNPC == current_npc)
+                npcTextDialog->showCloseButton();
+            // Otherwise, move on as an empty dialog doesn't help
+            else
+                temporaryNPC->nextDialog();
             break;
 
         case SMSG_NPC_NEXT:
-            // Next button in NPC dialog, currently unused
             id = msg->readInt32();
-            current_npc = dynamic_cast<NPC*>(beingManager->findBeing(id));
-            npcTextDialog->showNextButton();
+            temporaryNPC = dynamic_cast<NPC*>(beingManager->findBeing(id));
+            // If we're talking to that NPC, show the next button
+            if (temporaryNPC == current_npc)
+                npcTextDialog->showNextButton();
+            else
+            // Otherwise, move on as an empty dialog doesn't help
+                temporaryNPC->nextDialog();
             break;
 
         case SMSG_NPC_INT_INPUT: