Merged the tmwserv client with the eAthena client

This merge involved major changes on both sides, and as such took
several weeks. Lots of things are expected to be broken now, however, we
now have a single code base to improve and extend, which can be compiled
to support either eAthena or tmwserv.

In the coming months, the plan is to work towards a client that supports
both eAthena and tmwserv, without needing to be recompiled.

Conflicts:
	Everywhere!

1 files changed, 14 insertions, 6 deletions

diff --git a/src/gui/buy.h b/src/gui/buy.h
index 0f1cfede..5510ccc6 100644
--- a/src/gui/buy.h
+++ b/src/gui/buy.h
@@ -25,11 +25,13 @@
 #include <guichan/actionlistener.hpp>
 #include <guichan/selectionlistener.hpp>
 
-#include <SDL_types.h>
-
 #include "window.h"
 
+#include "../guichanfwd.h"
+
+#ifndef TMWSERV_SUPPORT
 class Network;
+#endif
 class ShopItems;
 class ShopListBox;
 class ListBox;
@@ -48,7 +50,11 @@ class BuyDialog : public Window, public gcn::ActionListener,
          *
          * @see Window::Window
          */
+#ifdef TMWSERV_SUPPORT
+        BuyDialog();
+#else
         BuyDialog(Network *network);
+#endif
 
         /**
          * Destructor
@@ -68,7 +74,7 @@ class BuyDialog : public Window, public gcn::ActionListener,
         /**
          * Adds an item to the shop inventory.
          */
-        void addItem(short id, int price);
+        void addItem(int id, int amount, int price);
 
         /**
          * Called when receiving actions from the widgets.
@@ -96,7 +102,9 @@ class BuyDialog : public Window, public gcn::ActionListener,
         void updateButtonsAndLabels();
 
     private:
+#ifdef EATHENA_SUPPORT
         Network *mNetwork;
+#endif
         gcn::Button *mBuyButton;
         gcn::Button *mQuitButton;
         gcn::Button *mIncreaseButton;
@@ -111,9 +119,9 @@ class BuyDialog : public Window, public gcn::ActionListener,
 
         ShopItems *mShopItems;
 
-        Uint32 mMoney;
-        Uint32 mAmountItems;
-        Uint32 mMaxItems;
+        int mMoney;
+        int mAmountItems;
+        int mMaxItems;
 };
 
 #endif