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, 3 deletions

diff --git a/src/item.cpp b/src/item.cpp
index 9165c6c8..042c3800 100644
--- a/src/item.cpp
+++ b/src/item.cpp
@@ -24,11 +24,17 @@
 #include "resources/image.h"
 #include "resources/resourcemanager.h"
 
-Item::Item(int id, int quantity, bool equipment, bool equipped):
+Item::Item(int id, int quantity, bool equipment
+#ifdef EATHENA_SUPPORT
+           , bool equipped
+#endif
+           ):
     mImage(0),
     mQuantity(quantity),
-    mEquipment(equipment),
-    mEquipped(equipped)
+    mEquipment(equipment)
+#ifdef EATHENA_SUPPORT
+    , mEquipped(equipped)
+#endif
 {
     setId(id);
 }
@@ -43,6 +49,11 @@ void Item::setId(int id)
 {
     mId = id;
 
+#ifdef TMWSERV_SUPPORT
+    // Types 0 and 1 are not equippable items.
+    mEquipment = id && getInfo().getType() >= 2;
+#endif
+
     // Load the associated image
     if (mImage)
         mImage->decRef();