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

diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp
index 2f118284..f7118755 100644
--- a/src/resources/iteminfo.cpp
+++ b/src/resources/iteminfo.cpp
@@ -44,6 +44,26 @@ void ItemInfo::setWeaponType(int type)
     // See server item.hpp file for type values.
     switch (type)
     {
+#ifdef TMWSERV_SUPPORT
+        case WPNTYPE_NONE:
+            mAttackType = ACTION_DEFAULT;
+            break;
+        case WPNTYPE_KNIFE:
+        case WPNTYPE_SWORD:
+            mAttackType = ACTION_ATTACK_STAB;
+            break;
+        case WPNTYPE_THROWN:
+            mAttackType = ACTION_ATTACK_THROW;
+            break;
+        case WPNTYPE_BOW:
+            mAttackType = ACTION_ATTACK_BOW;
+            break;
+        case WPNTYPE_POLEARM:
+            mAttackType = ACTION_ATTACK_SWING;
+            break;
+        default:
+            mAttackType = ACTION_ATTACK;
+#else
         case 0:     // none
             mAttackType = ACTION_DEFAULT;
             break;
@@ -62,6 +82,7 @@ void ItemInfo::setWeaponType(int type)
             break;
         default:
             mAttackType = ACTION_ATTACK;
+#endif
     }
 }