Merge branch 'eathena/master'

Conflicts:
	A lot of files.

1 files changed, 17 insertions, 0 deletions

diff --git a/src/gui/sell.h b/src/gui/sell.h
index f64a6fd5..b6388a1f 100644
--- a/src/gui/sell.h
+++ b/src/gui/sell.h
@@ -91,6 +91,20 @@ class SellDialog : public Window, gcn::ActionListener, gcn::SelectionListener
          */
         void setMoney(int amount);
 
+        /**
+         * Check for current NPC
+         */
+        void logic();
+
+        /**
+         * Sets the visibility of this window.
+         */
+        void setVisible(bool visible);
+
+        /**
+         * Closes the Buy Window, as well as resetting the current npc.
+         */
+        void close();
     private:
         /**
          * Updates the state of buttons and labels.
@@ -102,6 +116,7 @@ class SellDialog : public Window, gcn::ActionListener, gcn::SelectionListener
 #endif
         gcn::Button *mSellButton;
         gcn::Button *mQuitButton;
+        gcn::Button *mAddMaxButton;
         gcn::Button *mIncreaseButton;
         gcn::Button *mDecreaseButton;
         ShopListBox *mShopItemList;
@@ -119,4 +134,6 @@ class SellDialog : public Window, gcn::ActionListener, gcn::SelectionListener
         int mAmountItems;
 };
 
+extern SellDialog *sellDialog;
+
 #endif