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

diff --git a/src/gui/shop.cpp b/src/gui/shop.cpp
index a5f59bac..7b28cef4 100644
--- a/src/gui/shop.cpp
+++ b/src/gui/shop.cpp
@@ -38,17 +38,19 @@ std::string ShopItems::getElementAt(int i)
     return mShopItems.at(i)->getDisplayName();
 }
 
-void ShopItems::addItem(int inventoryIndex, short id, int amount, int price)
+void ShopItems::addItem(int id, int amount, int price)
 {
-    ShopItem *item = new ShopItem(id, amount, price);
-    item->setInvIndex(inventoryIndex);
-    mShopItems.push_back(item);
+    mShopItems.push_back(new ShopItem(id, amount, price));
 }
 
-void ShopItems::addItem(short id, int price)
+#ifdef EATHENA_SUPPORT
+void ShopItems::addItem(int inventoryIndex, int id, int amount, int price)
 {
-    mShopItems.push_back(new ShopItem(id, 0, price));
+    ShopItem *item = new ShopItem(id, amount, price);
+    item->setInvIndex(inventoryIndex);
+    mShopItems.push_back(item);
 }
+#endif
 
 ShopItem* ShopItems::at(int i) const
 {