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

diff --git a/src/itemshortcut.cpp b/src/itemshortcut.cpp
index b1dfb618..2dea8c56 100644
--- a/src/itemshortcut.cpp
+++ b/src/itemshortcut.cpp
@@ -72,14 +72,20 @@ void ItemShortcut::useItem(int index)
         {
             if (item->isEquipment())
             {
+#ifdef EATHENA_SUPPORT
                 if (item->isEquipped())
                     player_node->unequipItem(item);
                 else
+#endif
                     player_node->equipItem(item);
             }
             else
             {
+#ifdef TMWSERV_SUPPORT
+                player_node->useItem(item->getInvIndex());
+#else
                 player_node->useItem(item);
+#endif
             }
         }
     }