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, 26 insertions, 1 deletions

diff --git a/src/gui/equipmentwindow.h b/src/gui/equipmentwindow.h
index 24438477..7f7150ff 100644
--- a/src/gui/equipmentwindow.h
+++ b/src/gui/equipmentwindow.h
@@ -27,6 +27,7 @@
 #include "window.h"
 
 class Equipment;
+class Image;
 class Inventory;
 class Item;
 class ItemPopup;
@@ -52,7 +53,11 @@ class EquipmentWindow : public Window, public gcn::ActionListener
         /**
          * Constructor.
          */
+#ifdef TMWSERV_SUPPORT
+        EquipmentWindow(Equipment *equipment);
+#else
         EquipmentWindow();
+#endif
 
         /**
          * Destructor.
@@ -68,6 +73,23 @@ class EquipmentWindow : public Window, public gcn::ActionListener
 
         void mousePressed(gcn::MouseEvent& mouseEvent);
 
+#ifdef TMWSERV_SUPPORT
+        enum{
+            // Equipment rules:
+            EQUIP_TORSO_SLOT = 0,
+            EQUIP_ARMS_SLOT = 1,
+            EQUIP_HEAD_SLOT = 2,
+            EQUIP_LEGS_SLOT = 3,
+            EQUIP_FEET_SLOT = 4,
+            EQUIP_RING1_SLOT = 5,
+            EQUIP_RING2_SLOT = 6,
+            EQUIP_NECKLACE_SLOT = 7,
+            EQUIP_FIGHT1_SLOT = 8,
+            EQUIP_FIGHT2_SLOT = 9,
+            EQUIP_PROJECTILE_SLOT = 10,
+            EQUIP_VECTOREND
+        };
+#else
         enum {
             // Equipment rules:
             EQUIP_LEGS_SLOT = 0,
@@ -83,7 +105,7 @@ class EquipmentWindow : public Window, public gcn::ActionListener
             EQUIP_AMMO_SLOT,
             EQUIP_VECTOREND
         };
-
+#endif
 
     private:
         void mouseExited(gcn::MouseEvent &event);
@@ -92,8 +114,11 @@ class EquipmentWindow : public Window, public gcn::ActionListener
         Item* getItem(int x, int y) const;
 
         Equipment *mEquipment;
+#ifdef EATHENA_SUPPORT
         Inventory *mInventory;
+#endif
         gcn::Button *mUnequip;                  /**< Button for unequipping. */
+        Image *mBackground;                 /**< Background Image. */
         EquipBox mEquipBox[EQUIP_VECTOREND];    /**< Equipment Boxes. */
 
         ItemPopup *mItemPopup;