Merge equipment handling and fix some bugs

1 files changed, 4 insertions, 28 deletions

diff --git a/src/equipment.cpp b/src/equipment.cpp
index f760067c..1b17d66d 100644
--- a/src/equipment.cpp
+++ b/src/equipment.cpp
@@ -29,19 +29,10 @@
 #include <algorithm>
 
 Equipment::Equipment()
-#ifdef EATHENA_SUPPORT
-    : mArrows(-1)
-#endif
 {
-#ifdef TMWSERV_SUPPORT
     std::fill_n(mEquipment, EQUIPMENT_SIZE, (Item*) 0);
-#else
-    std::fill_n(mEquipment, EQUIPMENT_SIZE, -1);
-#endif
 }
 
-#ifdef TMWSERV_SUPPORT
-
 Equipment::~Equipment()
 {
     clear();
@@ -55,29 +46,14 @@ void Equipment::clear()
     std::fill_n(mEquipment, EQUIPMENT_SIZE, (Item*) 0);
 }
 
-void Equipment::setEquipment(int index, int id)
+void Equipment::setEquipment(int index, int id, int quantity)
 {
     if (mEquipment[index] && mEquipment[index]->getId() == id)
         return;
 
     delete mEquipment[index];
-    mEquipment[index] = (id > 0) ? new Item(id) : 0;
-}
-
-#else
+    mEquipment[index] = (id > 0) ? new Item(id, quantity) : 0;
 
-void Equipment::setEquipment(int index, int inventoryIndex)
-{
-    mEquipment[index] = inventoryIndex;
-    Item *item = player_node->getInventory()->getItem(inventoryIndex);
-    if (item)
-        item->setEquipped(true);
-}
-
-void Equipment::removeEquipment(int index)
-{
-     if (index >= 0 && index < EQUIPMENT_SIZE)
-         mEquipment[index] = -1;
+    if (mEquipment[index])
+        mEquipment[index]->setInvIndex(index);
 }
-
-#endif