From 5edddb1313ed0dc275e6ae70b8a1780ded3a590d Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 10 Jan 2012 21:06:33 +0300
Subject: Replace xmlStrEqual to xmlNameEqual.

---
 src/resources/emotedb.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/resources/emotedb.cpp')

diff --git a/src/resources/emotedb.cpp b/src/resources/emotedb.cpp
index 163d8b879..c6126a57b 100644
--- a/src/resources/emotedb.cpp
+++ b/src/resources/emotedb.cpp
@@ -54,7 +54,7 @@ void EmoteDB::load()
     XML::Document doc("emotes.xml");
     XmlNodePtr rootNode = doc.rootNode();
 
-    if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "emotes"))
+    if (!rootNode || !xmlNameEqual(rootNode, "emotes"))
     {
         logger->log1("Emote Database: Error while loading emotes.xml!");
         return;
@@ -63,7 +63,7 @@ void EmoteDB::load()
     //iterate <emote>s
     for_each_xml_child_node(emoteNode, rootNode)
     {
-        if (!xmlStrEqual(emoteNode->name, BAD_CAST "emote"))
+        if (!xmlNameEqual(emoteNode, "emote"))
             continue;
 
         int id = XML::getProperty(emoteNode, "id", -1);
@@ -81,7 +81,7 @@ void EmoteDB::load()
             if (!spriteNode->xmlChildrenNode)
                 continue;
 
-            if (xmlStrEqual(spriteNode->name, BAD_CAST "sprite"))
+            if (xmlNameEqual(spriteNode, "sprite"))
             {
                 EmoteSprite *currentSprite = new EmoteSprite;
                 std::string file = paths.getStringValue("sprites")
@@ -92,7 +92,7 @@ void EmoteDB::load()
                 currentSprite->name = XML::getProperty(spriteNode, "name", "");
                 currentInfo->sprites.push_back(currentSprite);
             }
-            else if (xmlStrEqual(spriteNode->name, BAD_CAST "particlefx"))
+            else if (xmlNameEqual(spriteNode, "particlefx"))
             {
                 std::string particlefx = reinterpret_cast<const char*>(
                     spriteNode->xmlChildrenNode->content);
@@ -108,7 +108,7 @@ void EmoteDB::load()
     XML::Document doc2("graphics/sprites/manaplus_emotes.xml");
     rootNode = doc2.rootNode();
 
-    if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "emotes"))
+    if (!rootNode || !xmlNameEqual(rootNode, "emotes"))
     {
         logger->log1("Emote Database: Error while loading"
                      " manaplus_emotes.xml!");
@@ -118,7 +118,7 @@ void EmoteDB::load()
     //iterate <emote>s
     for_each_xml_child_node(emoteNode, rootNode)
     {
-        if (!xmlStrEqual(emoteNode->name, BAD_CAST "emote"))
+        if (!xmlNameEqual(emoteNode, "emote"))
             continue;
 
         int id = XML::getProperty(emoteNode, "id", -1);
@@ -136,7 +136,7 @@ void EmoteDB::load()
             if (!spriteNode->xmlChildrenNode)
                 continue;
 
-            if (xmlStrEqual(spriteNode->name, BAD_CAST "sprite"))
+            if (xmlNameEqual(spriteNode, "sprite"))
             {
                 EmoteSprite *currentSprite = new EmoteSprite;
                 std::string file = paths.getStringValue("sprites")
@@ -147,7 +147,7 @@ void EmoteDB::load()
                 currentSprite->name = XML::getProperty(spriteNode, "name", "");
                 currentInfo->sprites.push_back(currentSprite);
             }
-            else if (xmlStrEqual(spriteNode->name, BAD_CAST "particlefx"))
+            else if (xmlNameEqual(spriteNode, "particlefx"))
             {
                 std::string particlefx = reinterpret_cast<const char*>(
                     spriteNode->xmlChildrenNode->content);
-- 
cgit v1.2.3-60-g2f50