Changed ItemEquipInfo to only be a pair of unsigned.

Previously it was a list of pair ofunsigned int,
used to get the equipment slot requirements.
It didn't make sense as the ItemEquipsInfo was already a list of it.
So you had to manage with a list of list and that ended up being
irrelevant to the need.

I had to disable the equip function to permit compilation.

This will be fixed in my next commit.

1 files changed, 4 insertions, 6 deletions

diff --git a/src/game-server/itemmanager.cpp b/src/game-server/itemmanager.cpp
index 2f15f005..074b8343 100644
--- a/src/game-server/itemmanager.cpp
+++ b/src/game-server/itemmanager.cpp
@@ -260,7 +260,6 @@ void ItemManager::readItemNode(xmlNodePtr itemNode)
 
 void ItemManager::readEquipNode(xmlNodePtr equipNode, ItemClass *item)
 {
-    ItemEquipInfo req;
     for_each_xml_child_node(subNode, equipNode)
     {
         if (xmlStrEqual(subNode->name, BAD_CAST "slot"))
@@ -274,24 +273,23 @@ void ItemManager::readEquipNode(xmlNodePtr equipNode, ItemClass *item)
             if (utils::isNumeric(slot))
             {
                 // When the slot id is given
-                req.push_back(std::make_pair(utils::stringToInt(slot),
-                           XML::getProperty(subNode, "required", 1)));
+                item->mEquip.push_back(std::make_pair(utils::stringToInt(slot),
+                    XML::getProperty(subNode, "required", 1)));
             }
             else
             {
                 // When its name is given
-                req.push_back(std::make_pair(getEquipSlotIdFromName(slot),
+                item->mEquip.push_back(std::make_pair(getEquipSlotIdFromName(slot),
                            XML::getProperty(subNode, "required", 1)));
             }
         }
     }
-    if (req.empty())
+    if (item->mEquip.empty())
     {
         LOG_WARN("Item Manager: empty equip requirement "
                  "definition for item " << item->getDatabaseID() << "!");
         return;
     }
-    item->mEquip.push_back(req);
 }
 
 void ItemManager::readEffectNode(xmlNodePtr effectNode, ItemClass *item)