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

diff --git a/src/inventory.h b/src/inventory.h
index 2c5d99e3..d2a81edf 100644
--- a/src/inventory.h
+++ b/src/inventory.h
@@ -24,8 +24,6 @@
 
 class Item;
 
-#define INVENTORY_SIZE 102
-
 class Inventory
 {
     public:
@@ -60,12 +58,12 @@ class Inventory
         /**
          * Adds a new item in a free slot.
          */
-        void addItem(int id, int quantity, bool equipment);
+        void addItem(int id, int quantity, bool equipment = false);
 
         /**
          * Sets the item at the given position.
          */
-        void setItem(int index, int id, int quantity, bool equipment);
+        void setItem(int index, int id, int quantity, bool equipment = false);
 
         /**
          * Remove a item from the inventory.
@@ -102,11 +100,7 @@ class Inventory
          */
         int getLastUsedSlot() const;
 
-        /**
-         * Returns the number of slots available in the inventory.
-         */
-        int getInventorySize() const;
-
+        static const int NO_SLOT_INDEX = -1; /**< Slot has no index. */
     protected:
         Item **mItems;  /**< The holder of items */
         int mSize;      /**< The max number of inventory items */