diff options
| author | Reid <reidyaro@gmail.com> | 2012-01-25 22:05:36 +0100 |
|---|---|---|
| committer | Reid <reidyaro@gmail.com> | 2012-01-25 22:05:36 +0100 |
| commit | 8b612abb42853a22c1a9545e2c9280d154646543 (patch) | |
| tree | f466167087c2b2de4b8aa9e6d1d1986f72f84147 /src/effectmanager.cpp | |
| parent | a913dd41df61760de6ece552f941e002251ff54c (diff) | |
| parent | d340b5a27a8f3b05d1764da9c114f5f59bd0cd46 (diff) | |
| download | manaplus-8b612abb42853a22c1a9545e2c9280d154646543.tar.gz manaplus-8b612abb42853a22c1a9545e2c9280d154646543.tar.bz2 manaplus-8b612abb42853a22c1a9545e2c9280d154646543.tar.xz manaplus-8b612abb42853a22c1a9545e2c9280d154646543.zip | |
Merge branch 'master' of gitorious.org:manaplus/manaplus
Diffstat (limited to 'src/effectmanager.cpp')
| -rw-r--r-- | src/effectmanager.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/effectmanager.cpp b/src/effectmanager.cpp index 55bf692cd..de12ecaa5 100644 --- a/src/effectmanager.cpp +++ b/src/effectmanager.cpp @@ -32,9 +32,9 @@ EffectManager::EffectManager() { XML::Document doc("effects.xml"); - xmlNodePtr root = doc.rootNode(); + XmlNodePtr root = doc.rootNode(); - if (!root || !xmlStrEqual(root->name, BAD_CAST "being-effects")) + if (!root || !xmlNameEqual(root, "being-effects")) { logger->log1("Error loading being effects file: effects.xml"); return; @@ -46,7 +46,7 @@ EffectManager::EffectManager() for_each_xml_child_node(node, root) { - if (xmlStrEqual(node->name, BAD_CAST "effect")) + if (xmlNameEqual(node, "effect")) { EffectDescription ed; ed.id = XML::getProperty(node, "id", -1); |