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, 9 insertions, 2 deletions

diff --git a/src/item.h b/src/item.h
index 3ea4a905..1fd1ee88 100644
--- a/src/item.h
+++ b/src/item.h
@@ -35,8 +35,11 @@ class Item
         /**
          * Constructor.
          */
-        Item(int id = -1, int quantity = 0,
-             bool equipment = false, bool equipped = false);
+        Item(int id = -1, int quantity = 0, bool equipment = false
+#ifdef EATHENA_SUPPORT
+             , bool equipped = false
+#endif
+            );
 
         /**
          * Destructor.
@@ -83,6 +86,7 @@ class Item
          */
         bool isEquipment() const { return mEquipment; }
 
+#ifdef EATHENA_SUPPORT
         /**
          * Sets whether this item is equipped.
          */
@@ -92,6 +96,7 @@ class Item
          * Returns whether this item is equipped.
          */
         bool isEquipped() const { return mEquipped; }
+#endif
 
         /**
          * Sets the inventory index of this item.
@@ -113,7 +118,9 @@ class Item
         Image *mImage;        /**< Item image. */
         int mQuantity;        /**< Number of items. */
         bool mEquipment;      /**< Item is equipment. */
+#ifdef EATHENA_SUPPORT
         bool mEquipped;       /**< Item is equipped. */
+#endif
         int mInvIndex;        /**< Inventory index. */
 };