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, 12 insertions, 0 deletions

diff --git a/src/gui/sell.h b/src/gui/sell.h
index c11a7b7c..f64a6fd5 100644
--- a/src/gui/sell.h
+++ b/src/gui/sell.h
@@ -30,7 +30,9 @@
 #include "window.h"
 
 class Item;
+#ifdef EATHENA_SUPPORT
 class Network;
+#endif
 class ShopItems;
 class ShopListBox;
 
@@ -47,7 +49,11 @@ class SellDialog : public Window, gcn::ActionListener, gcn::SelectionListener
          *
          * @see Window::Window
          */
+#ifdef TMWSERV_SUPPORT
+        SellDialog();
+#else
         SellDialog(Network *network);
+#endif
 
         /**
          * Destructor
@@ -62,7 +68,11 @@ class SellDialog : public Window, gcn::ActionListener, gcn::SelectionListener
         /**
          * Adds an item to the inventory.
          */
+#ifdef TMWSERV_SUPPORT
+        void addItem(int item, int amount, int price);
+#else
         void addItem(const Item *item, int price);
+#endif
 
         /**
          * Called when receiving actions from the widgets.
@@ -87,7 +97,9 @@ class SellDialog : public Window, gcn::ActionListener, gcn::SelectionListener
          */
         void updateButtonsAndLabels();
 
+#ifdef EATHENA_SUPPORT
         Network *mNetwork;
+#endif
         gcn::Button *mSellButton;
         gcn::Button *mQuitButton;
         gcn::Button *mIncreaseButton;