1 files changed, 10 insertions, 12 deletions
diff --git a/src/inventory.cpp b/src/inventory.cpp
index a6038c85..683251ed 100644
--- a/src/inventory.cpp
+++ b/src/inventory.cpp
@@ -36,7 +36,7 @@ struct SlotUsed : public std::unary_function<Item*, bool>
     }
 };
 
-Inventory::Inventory(int type, int size):
+Inventory::Inventory(Type type, int size):
     mType(type),
     mSize(size == -1 ? Net::getInventoryHandler()->getSize(type) : size),
     mUsed(0)
@@ -70,12 +70,12 @@ Item *Inventory::findItem(int itemId) const
     return NULL;
 }
 
-void Inventory::addItem(int id, int quantity, bool equipment)
+void Inventory::addItem(int id, int quantity)
 {
-    setItem(getFreeSlot(), id, quantity, equipment);
+    setItem(getFreeSlot(), id, quantity);
 }
 
-void Inventory::setItem(int index, int id, int quantity, bool equipment)
+void Inventory::setItem(int index, int id, int quantity)
 {
     if (index < 0 || index >= mSize)
     {
@@ -85,7 +85,7 @@ void Inventory::setItem(int index, int id, int quantity, bool equipment)
 
     if (!mItems[index] && id > 0)
     {
-        Item *item = new Item(id, quantity, equipment);
+        Item *item = new Item(id, quantity);
         item->setInvIndex(index);
         mItems[index] = item;
         mUsed++;
@@ -95,7 +95,6 @@ void Inventory::setItem(int index, int id, int quantity, bool equipment)
     {
         mItems[index]->setId(id);
         mItems[index]->setQuantity(quantity);
-        mItems[index]->setEquipment(equipment);
     }
     else if (mItems[index])
     {
@@ -120,11 +119,10 @@ void Inventory::removeItemAt(int index)
 {
     delete mItems[index];
     mItems[index] = 0;
-    mUsed--;
-    if (mUsed < 0) // Already at 0, no need to distribute event
-        mUsed = 0;
-    else
+    if (mUsed > 0) {
+        mUsed--;
         distributeSlotsChangedEvent();
+    }
 }
 
 bool Inventory::contains(Item *item) const
@@ -152,12 +150,12 @@ int Inventory::getLastUsedSlot() const
     return -1;
 }
 
-void Inventory::addInventoyListener(InventoryListener* listener)
+void Inventory::addInventoryListener(InventoryListener* listener)
 {
     mInventoryListeners.push_back(listener);
 }
 
-void Inventory::removeInventoyListener(InventoryListener* listener)
+void Inventory::removeInventoryListener(InventoryListener* listener)
 {
     mInventoryListeners.remove(listener);
 }