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, 13 insertions, 9 deletions

diff --git a/src/gui/sell.h b/src/gui/sell.h
index c2462762..0c768153 100644
--- a/src/gui/sell.h
+++ b/src/gui/sell.h
@@ -46,7 +46,7 @@ class SellDialog : public Window, gcn::ActionListener, gcn::SelectionListener
          *
          * @see Window::Window
          */
-        SellDialog();
+        SellDialog(int npcId);
 
         /**
          * Destructor
@@ -81,25 +81,31 @@ class SellDialog : public Window, gcn::ActionListener, gcn::SelectionListener
         void setMoney(int amount);
 
         /**
-         * Check for current NPC
+         * Sets the visibility of this window.
          */
-        void logic();
+        void setVisible(bool visible);
 
         /**
-         * Sets the visibility of this window.
+         * Returns true if any instances exist.
          */
-        void setVisible(bool visible);
+        static bool isActive() { return instances.size() > 0; }
 
         /**
-         * Closes the Buy Window, as well as resetting the current npc.
+         * Closes all instances.
          */
-        void close();
+        static void closeAll();
+
     private:
+        typedef std::list<SellDialog*> DialogList;
+        static DialogList instances;
+
         /**
          * Updates the state of buttons and labels.
          */
         void updateButtonsAndLabels();
 
+        int mNpcId;
+
         gcn::Button *mSellButton;
         gcn::Button *mQuitButton;
         gcn::Button *mAddMaxButton;
@@ -118,6 +124,4 @@ class SellDialog : public Window, gcn::ActionListener, gcn::SelectionListener
         int mAmountItems;
 };
 
-extern SellDialog *sellDialog;
-
 #endif