Handle NPC script close. Fixes client input freeze on no-dialog NPCs.

2 files changed, 13 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 33a9fa50..380c4382 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-28  Dennis Friis  <peavey@placid.dk>
+
+	* src/net/npchandler.cpp: Handle NPC script close. Fixes client input
+	freeze on no-dialog NPCs.
+
 2008-10-28  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
 	* src/game.cpp: Fixed trade window being visible on client startup
diff --git a/src/net/npchandler.cpp b/src/net/npchandler.cpp
index da21b2a5..d41aaaad 100644
--- a/src/net/npchandler.cpp
+++ b/src/net/npchandler.cpp
@@ -70,9 +70,15 @@ void NPCHandler::handleMessage(MessageIn *msg)
             npcTextDialog->setVisible(true);
             break;
 
-        case SMSG_NPC_NEXT:
         case SMSG_NPC_CLOSE:
-            // Next/Close button in NPC dialog, currently unused
+            id = msg->readInt32();
+            dynamic_cast<NPC*>(beingManager->findBeing(id));
+            if (current_npc == dynamic_cast<NPC*>(beingManager->findBeing(id)))
+            	current_npc = NULL;
+            break;
+
+        case SMSG_NPC_NEXT:
+            // Next button in NPC dialog, currently unused
             break;
     }
 }