Merge branch 'aethyra/master'

Conflicts:
	Many files.

1 files changed, 8 insertions, 0 deletions

diff --git a/src/gui/buy.h b/src/gui/buy.h
index 5e2f0b8f..2e6b5377 100644
--- a/src/gui/buy.h
+++ b/src/gui/buy.h
@@ -100,12 +100,20 @@ class BuyDialog : public Window, public gcn::ActionListener,
          */
         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:
         Network *mNetwork;
         gcn::Button *mBuyButton;
         gcn::Button *mQuitButton;
+        gcn::Button *mAddMaxButton;
         gcn::Button *mIncreaseButton;
         gcn::Button *mDecreaseButton;
         ShopListBox *mShopItemList;