Merged trunk development between revisions 2530 and 2618 to the 0.1.0 branch.

1 files changed, 7 insertions, 5 deletions

diff --git a/src/resources/itemmanager.cpp b/src/resources/itemmanager.cpp
index 63c0b036..a497b3c8 100644
--- a/src/resources/itemmanager.cpp
+++ b/src/resources/itemmanager.cpp
@@ -68,8 +68,8 @@ ItemManager::ItemManager()
 
     for (node = node->xmlChildrenNode; node != NULL; node = node->next)
     {
-        int id = 0, image = 0, art = 0, type = 0, weight = 0, slot = 0;
-        std::string name = "", description = "", effect = "";
+        int id = 0, art = 0, type = 0, weight = 0, slot = 0;
+        std::string name = "", description = "", effect = "", image = "";
 
         if (!xmlStrEqual(node->name, BAD_CAST "item")) {
             continue;
@@ -77,7 +77,7 @@ ItemManager::ItemManager()
 
         xmlChar *prop = NULL;
         READ_PROP(node, prop, "id", id, atoi);
-        READ_PROP(node, prop, "image", image, atoi);
+        READ_PROP(node, prop, "image", image, );
         READ_PROP(node, prop, "art", art, atoi);
         READ_PROP(node, prop, "name", name, );
         READ_PROP(node, prop, "description", description, );
@@ -86,6 +86,7 @@ ItemManager::ItemManager()
         READ_PROP(node, prop, "weight", weight, atoi);
         READ_PROP(node, prop, "slot", slot, atoi);
 
+
         if (id && name != "")
         {
             ItemInfo *itemInfo = new ItemInfo();
@@ -100,6 +101,7 @@ ItemManager::ItemManager()
             mItemInfos[id] = itemInfo;
         }
 
+
         if (id == 0)
         {
             logger->log("Item Manager: An item has no ID in items.xml!");
@@ -109,7 +111,7 @@ ItemManager::ItemManager()
             logger->log("Item Manager: An item has no name in items.xml!");
         }
 
-        if (image == 0)
+        if (image == "")
         {
             logger->log("Item Manager: Missing image parameter for item: %i. %s",
                     id, name.c_str());
@@ -141,7 +143,7 @@ ItemManager::ItemManager()
         }
         if (slot == 0)
         {
-            logger->log("Item Manager: Missing image parameter for item: %i. %s",
+            logger->log("Item Manager: Missing slot parameter for item: %i. %s",
                     id, name.c_str());
         }