From 2fcfbc4b1136265cbd463b9d3b721ce0cad52fe0 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 21 Oct 2011 02:19:07 +0300
Subject: Fix parsing replace tags without item ids inside in items.xml.

---
 src/resources/itemdb.cpp | 35 +++++++++++++++++++++++++----------
 1 file changed, 25 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index 9ff80de22..74474e067 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -636,19 +636,20 @@ void loadReplaceSprite(ItemInfo *itemInfo, xmlNodePtr replaceNode)
     {
         case -1:
         {
-            for_each_xml_child_node(itemNode, replaceNode)
+            for (int f = 0; f < 9; f ++)
             {
-                if (xmlStrEqual(itemNode->name, BAD_CAST "item"))
+                std::map<int, int> *mapList
+                    = itemInfo->addReplaceSprite(
+                    parseSpriteName(removeSprite), f);
+                if (!mapList)
+                    continue;
+                for_each_xml_child_node(itemNode, replaceNode)
                 {
-                    int from = XML::getProperty(itemNode, "from", 0);
-                    int to = XML::getProperty(itemNode, "to", 1);
-                    for (int f = 0; f < 9; f ++)
+                    if (xmlStrEqual(itemNode->name, BAD_CAST "item"))
                     {
-                        std::map<int, int> *mapList
-                            = itemInfo->addReplaceSprite(
-                            parseSpriteName(removeSprite), f);
-                        if (!mapList)
-                            continue;
+                        int from = XML::getProperty(itemNode, "from", 0);
+                        int to = XML::getProperty(itemNode, "to", 1);
+
                         (*mapList)[from] = to;
                     }
                 }
@@ -657,6 +658,13 @@ void loadReplaceSprite(ItemInfo *itemInfo, xmlNodePtr replaceNode)
         }
         case -2:
         {
+            itemInfo->addReplaceSprite(parseSpriteName(
+                removeSprite), DIRECTION_DOWN);
+            itemInfo->addReplaceSprite(parseSpriteName(
+                removeSprite), DIRECTION_DOWNLEFT);
+            itemInfo->addReplaceSprite(parseSpriteName(
+                removeSprite), DIRECTION_DOWNRIGHT);
+
             for_each_xml_child_node(itemNode, replaceNode)
             {
                 if (xmlStrEqual(itemNode->name, BAD_CAST "item"))
@@ -683,6 +691,13 @@ void loadReplaceSprite(ItemInfo *itemInfo, xmlNodePtr replaceNode)
         }
         case -3:
         {
+            itemInfo->addReplaceSprite(parseSpriteName(
+                removeSprite), DIRECTION_UP);
+            itemInfo->addReplaceSprite(parseSpriteName(
+                removeSprite), DIRECTION_UPLEFT);
+            itemInfo->addReplaceSprite(parseSpriteName(
+                removeSprite), DIRECTION_UPRIGHT);
+
             for_each_xml_child_node(itemNode, replaceNode)
             {
                 if (xmlStrEqual(itemNode->name, BAD_CAST "item"))
-- 
cgit v1.2.3-60-g2f50