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, 16 insertions, 7 deletions

diff --git a/src/gui/buysell.h b/src/gui/buysell.h
index 0294ad18..33314420 100644
--- a/src/gui/buysell.h
+++ b/src/gui/buysell.h
@@ -40,12 +40,9 @@ class BuySellDialog : public Window, public gcn::ActionListener
          *
          * @see Window::Window
          */
-        BuySellDialog();
+        BuySellDialog(int npcId);
 
-        /**
-         * Check for current NPC
-         */
-        void logic();
+        ~BuySellDialog();
 
         void setVisible(bool visible);
 
@@ -54,10 +51,22 @@ class BuySellDialog : public Window, public gcn::ActionListener
          */
         void action(const gcn::ActionEvent &event);
 
+        /**
+         * Returns true if any instances exist.
+         */
+        static bool isActive() { return instances.size() > 0; }
+
+        /**
+         * Closes all instances.
+         */
+        static void closeAll();
+
     private:
+        typedef std::list<BuySellDialog*> DialogList;
+        static DialogList instances;
+
+        int mNpcId;
         gcn::Button *mBuyButton;
 };
 
-extern BuySellDialog *buySellDialog;
-
 #endif