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, 3 insertions, 8 deletions

diff --git a/src/npc.cpp b/src/npc.cpp
index b9cb6b41..b546d665 100644
--- a/src/npc.cpp
+++ b/src/npc.cpp
@@ -37,8 +37,6 @@
 
 #include "resources/npcdb.h"
 
-int current_npc = 0;
-
 NPC::NPC(int id, int job, Map *map):
     Player(id, job, map, true)
 {
@@ -80,9 +78,6 @@ void NPC::setName(const std::string &name)
 
 void NPC::talk()
 {
-    if (isTalking())
-        return;
-
     Net::getNpcHandler()->talk(mId);
 }
 
@@ -93,7 +88,7 @@ void NPC::setSprite(unsigned int slot, int id, const std::string &color)
 
 const bool NPC::isTalking()
 {
-    return npcDialog->isVisible() || buyDialog->isVisible() ||
-           sellDialog->isVisible() || buySellDialog->isVisible() ||
-           npcPostDialog->isVisible();
+    return NpcDialog::isActive() || BuyDialog::isActive() ||
+           SellDialog::isActive() || BuySellDialog::isActive() ||
+           NpcPostDialog::isActive();
 }