Make NPC dialogs instance instead of global

This change allows players to talk to multiple NPCs at a time (if the server agrees). Manaserv's netcode allows multiple commerce instances too. eAthena's is limited to one commerce instance, due to protocol limitations.

1 files changed, 5 insertions, 5 deletions

diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp
index 7fb4dab9..34e0daf4 100644
--- a/src/net/ea/playerhandler.cpp
+++ b/src/net/ea/playerhandler.cpp
@@ -80,15 +80,15 @@ namespace {
         {
             Net::getPlayerHandler()->respawn();
             deathNotice = NULL;
-            buyDialog->setVisible(false);
-            sellDialog->setVisible(false);
-            buySellDialog->setVisible(false);
+
+            BuyDialog::closeAll();
+            BuySellDialog::closeAll();
+            NpcDialog::closeAll();
+            SellDialog::closeAll();
 
             if (storageWindow->isVisible())
                 storageWindow->close();
             viewport->closePopupMenu();
-            npcDialog->closeDialog();
-            current_npc = 0;
         }
     } deathListener;