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.

13 files changed, 265 insertions, 102 deletions

diff --git a/src/gui/buy.cpp b/src/gui/buy.cpp
index bc58ef09..71589374 100644
--- a/src/gui/buy.cpp
+++ b/src/gui/buy.cpp
@@ -43,12 +43,14 @@
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
-BuyDialog::BuyDialog():
+BuyDialog::DialogList BuyDialog::instances;
+
+BuyDialog::BuyDialog(int npcId):
     Window(_("Buy")),
-    mMoney(0), mAmountItems(0), mMaxItems(0)
+    mNpcId(npcId), mMoney(0), mAmountItems(0), mMaxItems(0)
 {
     setWindowName("Buy");
-    setupWindow->registerWindowForReset(this);
+    //setupWindow->registerWindowForReset(this);
     setResizable(true);
     setCloseButton(true);
     setMinWidth(260);
@@ -107,11 +109,16 @@ BuyDialog::BuyDialog():
 
     center();
     loadWindowState();
+
+    instances.push_back(this);
+    setVisible(true);
 }
 
 BuyDialog::~BuyDialog()
 {
     delete mShopItems;
+
+    instances.remove(this);
 }
 
 void BuyDialog::setMoney(int amount)
@@ -186,7 +193,7 @@ void BuyDialog::action(const gcn::ActionEvent &event)
     else if (event.getId() == "buy" && mAmountItems > 0 &&
                 mAmountItems <= mMaxItems)
     {
-        Net::getNpcHandler()->buyItem(current_npc,
+        Net::getNpcHandler()->buyItem(mNpcId,
                                       mShopItems->at(selectedItem)->getId(),
                                       mAmountItems);
 
@@ -251,23 +258,27 @@ void BuyDialog::updateButtonsAndLabels()
                     Units::formatCurrency(mMoney - price).c_str()));
 }
 
-void BuyDialog::logic()
-{
-    Window::logic();
-
-    if (!current_npc) setVisible(false);
-}
-
 void BuyDialog::setVisible(bool visible)
 {
     Window::setVisible(visible);
 
     if (visible)
+    {
         mShopItemList->requestFocus();
+    }
+    else
+    {
+        scheduleDelete();
+    }
 }
 
-void BuyDialog::close()
+void BuyDialog::closeAll()
 {
-    setVisible(false);
-    current_npc = 0;
+    DialogList::iterator it = instances.begin();
+    DialogList::iterator it_end = instances.end();
+
+    for (; it != it_end; it++)
+    {
+        (*it)->close();
+    }
 }
diff --git a/src/gui/buy.h b/src/gui/buy.h
index 68854a82..d44d63d2 100644
--- a/src/gui/buy.h
+++ b/src/gui/buy.h
@@ -47,7 +47,7 @@ class BuyDialog : public Window, public gcn::ActionListener,
          *
          * @see Window::Window
          */
-        BuyDialog();
+        BuyDialog(int npcId);
 
         /**
          * Destructor
@@ -95,21 +95,26 @@ class BuyDialog : public Window, public gcn::ActionListener,
         void updateButtonsAndLabels();
 
         /**
-         * 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<BuyDialog*> DialogList;
+        static DialogList instances;
+
+        int mNpcId;
+
         gcn::Button *mBuyButton;
         gcn::Button *mQuitButton;
         gcn::Button *mAddMaxButton;
@@ -128,6 +133,4 @@ class BuyDialog : public Window, public gcn::ActionListener,
         int mMaxItems;
 };
 
-extern BuyDialog *buyDialog;
-
 #endif
diff --git a/src/gui/buysell.cpp b/src/gui/buysell.cpp
index 1258e1d5..8a149a2d 100644
--- a/src/gui/buysell.cpp
+++ b/src/gui/buysell.cpp
@@ -32,12 +32,16 @@
 
 #include "utils/gettext.h"
 
-BuySellDialog::BuySellDialog():
+BuySellDialog::DialogList BuySellDialog::instances;
+
+BuySellDialog::BuySellDialog(int npcId):
     Window(_("Shop")),
+    mNpcId(npcId),
     mBuyButton(0)
 {
     setWindowName("BuySell");
-    setupWindow->registerWindowForReset(this);
+    //setupWindow->registerWindowForReset(this);
+    setCloseButton(true);
 
     static const char *buttonNames[] = {
         N_("Buy"), N_("Sell"), N_("Cancel"), 0
@@ -60,14 +64,14 @@ BuySellDialog::BuySellDialog():
     center();
     setDefaultSize();
     loadWindowState();
+
+    instances.push_back(this);
+    setVisible(true);
 }
 
-void BuySellDialog::logic()
+BuySellDialog::~BuySellDialog()
 {
-    Window::logic();
-
-    if (isVisible() && !current_npc)
-        setVisible(false);
+    instances.remove(this);
 }
 
 void BuySellDialog::setVisible(bool visible)
@@ -75,24 +79,36 @@ void BuySellDialog::setVisible(bool visible)
     Window::setVisible(visible);
 
     if (visible)
+    {
         mBuyButton->requestFocus();
+    }
+    else
+    {
+        scheduleDelete();
+    }
 }
 
 void BuySellDialog::action(const gcn::ActionEvent &event)
 {
-    setVisible(false);
-
     if (event.getId() == "Buy")
     {
-        Net::getNpcHandler()->buy(current_npc);
+        Net::getNpcHandler()->buy(mNpcId);
     }
     else if (event.getId() == "Sell")
     {
-        Net::getNpcHandler()->sell(current_npc);
+        Net::getNpcHandler()->sell(mNpcId);
     }
-    else if (event.getId() == "Cancel")
+
+    close();
+}
+
+void BuySellDialog::closeAll()
+{
+    DialogList::iterator it = instances.begin();
+    DialogList::iterator it_end = instances.end();
+
+    for (; it != it_end; it++)
     {
-        current_npc = 0;
-        return;
+        (*it)->close();
     }
 }
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
diff --git a/src/gui/npcdialog.cpp b/src/gui/npcdialog.cpp
index ae96c352..f1b671b1 100644
--- a/src/gui/npcdialog.cpp
+++ b/src/gui/npcdialog.cpp
@@ -46,9 +46,11 @@
 #define CAPTION_CLOSE _("Close")
 #define CAPTION_SUBMIT _("Submit")
 
-NpcDialog::NpcDialog()
+NpcDialog::DialogList NpcDialog::instances;
+
+NpcDialog::NpcDialog(int npcId)
     : Window(_("NPC")),
-      mNpcId(0),
+      mNpcId(npcId),
       mDefaultInt(0),
       mInputState(NPC_INPUT_NONE),
       mActionState(NPC_ACTION_WAIT)
@@ -56,7 +58,8 @@ NpcDialog::NpcDialog()
     // Basic Window Setup
     setWindowName("NpcText");
     setResizable(true);
-    setupWindow->registerWindowForReset(this);
+    //setupWindow->registerWindowForReset(this);
+    setFocusable(true);
 
     setMinWidth(200);
     setMinHeight(150);
@@ -111,17 +114,24 @@ NpcDialog::NpcDialog()
 
     center();
     loadWindowState();
+
+    instances.push_back(this);
+    setVisible(true);
+    requestFocus();
 }
 
 NpcDialog::~NpcDialog()
 {
     // These might not actually be in the layout, so lets be safe
+    delete mScrollArea;
     delete mItemList;
     delete mTextField;
     delete mIntField;
     delete mResetButton;
     delete mPlusButton;
     delete mMinusButton;
+
+    instances.remove(this);
 }
 
 void NpcDialog::setText(const std::string &text)
@@ -162,10 +172,7 @@ void NpcDialog::action(const gcn::ActionEvent &event)
         }
         else if (mActionState == NPC_ACTION_CLOSE)
         {
-            if (current_npc)
-                closeDialog();
-            setVisible(false);
-            current_npc = 0;
+            closeDialog();
         }
         else if (mActionState == NPC_ACTION_INPUT)
         {
@@ -276,6 +283,22 @@ bool NpcDialog::isInputFocused() const
     return mTextField->isFocused() || mIntField->isFocused();
 }
 
+bool NpcDialog::isAnyInputFocused()
+{
+    DialogList::iterator it = instances.begin();
+    DialogList::iterator it_end = instances.end();
+
+    for (; it != it_end; it++)
+    {
+        if ((*it)->isInputFocused())
+        {
+            return true;
+        }
+    }
+
+    return false;
+}
+
 void NpcDialog::integerRequest(int defaultValue, int min, int max)
 {
     mActionState = NPC_ACTION_INPUT;
@@ -312,6 +335,43 @@ void NpcDialog::widgetResized(const gcn::Event &event)
     setText(mText);
 }
 
+void NpcDialog::setVisible(bool visible)
+{
+    Window::setVisible(visible);
+
+    if (!visible)
+    {
+        scheduleDelete();
+    }
+}
+
+NpcDialog *NpcDialog::getActive()
+{
+    DialogList::iterator it = instances.begin();
+    DialogList::iterator it_end = instances.end();
+
+    for (; it != it_end; it++)
+    {
+        if ((*it)->isFocused())
+        {
+            return (*it);
+        }
+    }
+
+    return NULL;
+}
+
+void NpcDialog::closeAll()
+{
+    DialogList::iterator it = instances.begin();
+    DialogList::iterator it_end = instances.end();
+
+    for (; it != it_end; it++)
+    {
+        (*it)->close();
+    }
+}
+
 void NpcDialog::buildLayout()
 {
     clearLayout();
diff --git a/src/gui/npcdialog.h b/src/gui/npcdialog.h
index 327ab6dd..18e8a8ae 100644
--- a/src/gui/npcdialog.h
+++ b/src/gui/npcdialog.h
@@ -29,6 +29,7 @@
 #include <guichan/actionlistener.hpp>
 #include <guichan/listmodel.hpp>
 
+#include <list>
 #include <string>
 #include <vector>
 
@@ -52,7 +53,7 @@ class NpcDialog : public Window, public gcn::ActionListener,
          *
          * @see Window::Window
          */
-        NpcDialog();
+        NpcDialog(int npcId);
 
         ~NpcDialog();
 
@@ -61,11 +62,6 @@ class NpcDialog : public Window, public gcn::ActionListener,
          */
         void action(const gcn::ActionEvent &event);
 
-        void setNpc(int npc)
-        { mNpcId = npc; }
-
-        void clearText();
-
         /**
         * Sets the text shows in the dialog.
         *
@@ -136,6 +132,8 @@ class NpcDialog : public Window, public gcn::ActionListener,
 
         bool isInputFocused() const;
 
+        static bool isAnyInputFocused();
+
         /**
          * Requests a interger from the user.
          */
@@ -151,7 +149,28 @@ class NpcDialog : public Window, public gcn::ActionListener,
          */
         void widgetResized(const gcn::Event &event);
 
+        void setVisible(bool visible);
+
+        /**
+         * Returns true if any instances exist.
+         */
+        static bool isActive() { return instances.size() > 0; }
+
+        /**
+         * Returns the first active instance. Useful for pushing user
+         * interaction.
+         */
+        static NpcDialog *getActive();
+
+        /**
+         * Closes all instances.
+         */
+        static void closeAll();
+
     private:
+        typedef std::list<NpcDialog*> DialogList;
+        static DialogList instances;
+
         void buildLayout();
 
         int mNpcId;
@@ -201,8 +220,4 @@ class NpcDialog : public Window, public gcn::ActionListener,
         NpcActionState mActionState;
 };
 
-// TODO: This should be made not to be global, later.
-
-extern NpcDialog* npcDialog;
-
 #endif // NPCDIALOG_H
diff --git a/src/gui/npcpostdialog.cpp b/src/gui/npcpostdialog.cpp
index a05008ec..cb6660c6 100644
--- a/src/gui/npcpostdialog.cpp
+++ b/src/gui/npcpostdialog.cpp
@@ -35,8 +35,11 @@
 
 #include "utils/gettext.h"
 
-NpcPostDialog::NpcPostDialog():
-    Window(_("NPC"))
+NpcPostDialog::DialogList NpcPostDialog::instances;
+
+NpcPostDialog::NpcPostDialog(int npcId):
+    Window(_("NPC")),
+    mNpcId(npcId)
 {
     setContentSize(400, 180);
 
@@ -74,6 +77,14 @@ NpcPostDialog::NpcPostDialog():
     add(cancelButton);
 
     setLocationRelativeTo(getParent());
+
+    instances.push_back(this);
+    setVisible(true);
+}
+
+NpcPostDialog::~NpcPostDialog()
+{
+    instances.remove(this);
 }
 
 void NpcPostDialog::action(const gcn::ActionEvent &event)
@@ -87,21 +98,34 @@ void NpcPostDialog::action(const gcn::ActionEvent &event)
         }
         else
         {
-            Net::getNpcHandler()->sendLetter(current_npc, mSender->getText(),
+            Net::getNpcHandler()->sendLetter(mNpcId, mSender->getText(),
                                              mText->getText());
         }
         setVisible(false);
-        clear();
     }
     else if (event.getId() == "cancel")
     {
         setVisible(false);
-        clear();
     }
 }
 
-void NpcPostDialog::clear()
+void NpcPostDialog::setVisible(bool visible)
+{
+    Window::setVisible(visible);
+
+    if (!visible)
+    {
+        scheduleDelete();
+    }
+}
+
+void NpcPostDialog::closeAll()
 {
-    mSender->setText("");
-    mText->setText("");
+    DialogList::iterator it = instances.begin();
+    DialogList::iterator it_end = instances.end();
+
+    for (; it != it_end; it++)
+    {
+        (*it)->close();
+    }
 }
diff --git a/src/gui/npcpostdialog.h b/src/gui/npcpostdialog.h
index 355d0ae1..9364eb0e 100644
--- a/src/gui/npcpostdialog.h
+++ b/src/gui/npcpostdialog.h
@@ -35,23 +35,35 @@ public:
     /**
      * Constructor
      */
-    NpcPostDialog();
+    NpcPostDialog(int npcId);
+
+    ~NpcPostDialog();
 
     /**
      * Called when receiving actions from the widgets.
      */
     void action(const gcn::ActionEvent &event);
 
+    void setVisible(bool visible);
+
+    /**
+     * Returns true if any instances exist.
+     */
+    static bool isActive() { return instances.size() > 0; }
+
     /**
-     * Clear the contents of the dialog
+     * Closes all instances.
      */
-    void clear();
+    static void closeAll();
 
 private:
+    typedef std::list<NpcPostDialog*> DialogList;
+    static DialogList instances;
+
+    int mNpcId;
+
     TextBox *mText;
     TextField *mSender;
 };
 
-extern NpcPostDialog *npcPostDialog;
-
 #endif
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 75259dda..878ba7b8 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -205,9 +205,7 @@ void PopupMenu::handleLink(const std::string &link)
 
     // Talk To action
     if (link == "talk" &&
-        being &&
-        being->getType() == Being::NPC &&
-        current_npc == 0)
+        being && being->getType() == Being::NPC)
     {
         dynamic_cast<NPC*>(being)->talk();
     }
diff --git a/src/gui/sell.cpp b/src/gui/sell.cpp
index 3e3fdad5..214c70ab 100644
--- a/src/gui/sell.cpp
+++ b/src/gui/sell.cpp
@@ -43,12 +43,14 @@
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
-SellDialog::SellDialog():
+SellDialog::DialogList SellDialog::instances;
+
+SellDialog::SellDialog(int npcId):
     Window(_("Sell")),
-    mMaxItems(0), mAmountItems(0)
+    mNpcId(npcId), mMaxItems(0), mAmountItems(0)
 {
     setWindowName("Sell");
-    setupWindow->registerWindowForReset(this);
+    //setupWindow->registerWindowForReset(this);
     setResizable(true);
     setCloseButton(true);
     setMinWidth(260);
@@ -106,11 +108,16 @@ SellDialog::SellDialog():
 
     center();
     loadWindowState();
+
+    instances.push_back(this);
+    setVisible(true);
 }
 
 SellDialog::~SellDialog()
 {
     delete mShopItems;
+
+    instances.remove(this);
 }
 
 void SellDialog::reset()
@@ -190,7 +197,7 @@ void SellDialog::action(const gcn::ActionEvent &event)
             // the inventory index of the next Duplicate otherwise.
             itemIndex = item->getCurrentInvIndex();
             sellCount = item->sellCurrentDuplicate(mAmountItems);
-            Net::getNpcHandler()->sellItem(current_npc, itemIndex, sellCount);
+            Net::getNpcHandler()->sellItem(mNpcId, itemIndex, sellCount);
             mAmountItems -= sellCount;
         }
 
@@ -271,23 +278,27 @@ void SellDialog::updateButtonsAndLabels()
                     Units::formatCurrency(mPlayerMoney + income).c_str()));
 }
 
-void SellDialog::logic()
-{
-    Window::logic();
-
-    if (!current_npc) setVisible(false);
-}
-
 void SellDialog::setVisible(bool visible)
 {
     Window::setVisible(visible);
 
     if (visible)
+    {
         mShopItemList->requestFocus();
+    }
+    else
+    {
+        scheduleDelete();
+    }
 }
 
-void SellDialog::close()
+void SellDialog::closeAll()
 {
-    setVisible(false);
-    current_npc = 0;
+    DialogList::iterator it = instances.begin();
+    DialogList::iterator it_end = instances.end();
+
+    for (; it != it_end; it++)
+    {
+        (*it)->close();
+    }
 }
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
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index a0a92edd..61c17ac8 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -300,7 +300,7 @@ void Viewport::mousePressed(gcn::MouseEvent &event)
         return;
 
     // Check if we are busy
-    if (current_npc)
+    if (NPC::isTalking())
         return;
 
     mPlayerFollowMouse = false;
diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h
index 45dfc5db..37a6b1eb 100644
--- a/src/gui/widgets/window.h
+++ b/src/gui/widgets/window.h
@@ -171,7 +171,7 @@ class Window : public gcn::Window, gcn::WidgetListener
          * Overloads window setVisible by Guichan to allow sticky window
          * handling.
          */
-        void setVisible(bool visible);
+        virtual void setVisible(bool visible);
 
         /**
          * Overloads window setVisible by Guichan to allow sticky window