summaryrefslogtreecommitdiff
path: root/src/resources/npcdb.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-01-10 21:06:33 +0300
committerAndrei Karas <akaras@inbox.ru>2012-01-10 21:06:33 +0300
commit5edddb1313ed0dc275e6ae70b8a1780ded3a590d (patch)
treefffa478013e8f3622c4e7f85eeb71609cb352322 /src/resources/npcdb.cpp
parenta057817a0983b3a3190f6773101f788f2c6278ba (diff)
downloadmanaplus-5edddb1313ed0dc275e6ae70b8a1780ded3a590d.tar.gz
manaplus-5edddb1313ed0dc275e6ae70b8a1780ded3a590d.tar.bz2
manaplus-5edddb1313ed0dc275e6ae70b8a1780ded3a590d.tar.xz
manaplus-5edddb1313ed0dc275e6ae70b8a1780ded3a590d.zip
Replace xmlStrEqual to xmlNameEqual.
Diffstat (limited to 'src/resources/npcdb.cpp')
-rw-r--r--src/resources/npcdb.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/resources/npcdb.cpp b/src/resources/npcdb.cpp
index b823620f0..832fa26d6 100644
--- a/src/resources/npcdb.cpp
+++ b/src/resources/npcdb.cpp
@@ -48,7 +48,7 @@ void NPCDB::load()
XML::Document doc("npcs.xml");
XmlNodePtr rootNode = doc.rootNode();
- if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "npcs"))
+ if (!rootNode || !xmlNameEqual(rootNode, "npcs"))
{
logger->log("NPC Database: Error while loading npcs.xml!");
mLoaded = true;
@@ -58,7 +58,7 @@ void NPCDB::load()
//iterate <npc>s
for_each_xml_child_node(npcNode, rootNode)
{
- if (!xmlStrEqual(npcNode->name, BAD_CAST "npc"))
+ if (!xmlNameEqual(npcNode, "npc"))
continue;
int id = XML::getProperty(npcNode, "id", 0);
@@ -84,7 +84,7 @@ void NPCDB::load()
if (!spriteNode->xmlChildrenNode)
continue;
- if (xmlStrEqual(spriteNode->name, BAD_CAST "sprite"))
+ if (xmlNameEqual(spriteNode, "sprite"))
{
SpriteReference *currentSprite = new SpriteReference;
currentSprite->sprite = reinterpret_cast<const char*>(
@@ -93,7 +93,7 @@ void NPCDB::load()
XML::getProperty(spriteNode, "variant", 0);
display.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);