Merge branch 'aethyra/master'

Conflicts:
	Many files.

1 files changed, 8 insertions, 0 deletions

diff --git a/src/gui/sell.h b/src/gui/sell.h
index 3ae5e320..45b6a704 100644
--- a/src/gui/sell.h
+++ b/src/gui/sell.h
@@ -86,8 +86,15 @@ class SellDialog : public Window, gcn::ActionListener, gcn::SelectionListener
          */
         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.
@@ -97,6 +104,7 @@ class SellDialog : public Window, gcn::ActionListener, gcn::SelectionListener
         Network *mNetwork;
         gcn::Button *mSellButton;
         gcn::Button *mQuitButton;
+        gcn::Button *mAddMaxButton;
         gcn::Button *mIncreaseButton;
         gcn::Button *mDecreaseButton;
         ShopListBox *mShopItemList;