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

diff --git a/src/gui/itemshortcutcontainer.cpp b/src/gui/itemshortcutcontainer.cpp
index e5990a28..8864cbd9 100644
--- a/src/gui/itemshortcutcontainer.cpp
+++ b/src/gui/itemshortcutcontainer.cpp
@@ -102,14 +102,18 @@ void ItemShortcutContainer::draw(gcn::Graphics *graphics)
 
         Item *item =
             player_node->getInventory()->findItem(itemShortcut->getItem(i));
-        if (item) {
+        if (item)
+        {
             // Draw item icon.
-            const std::string label =
-                item->isEquipped() ? "Eq." : toString(item->getQuantity());
             Image* image = item->getImage();
-            if (image) {
+
+            if (image)
+            {
                 const std::string label =
-                    item->isEquipped() ? "Eq." : toString(item->getQuantity());
+#ifdef EATHENA_SUPPORT
+                    item->isEquipped() ? "Eq." :
+#endif
+                    toString(item->getQuantity());
                 g->drawImage(image, itemX, itemY);
                 g->drawText(
                         label,