diff options
author | Philipp Sehmisch <tmw@crushnet.org> | 2008-05-21 21:44:27 +0000 |
---|---|---|
committer | Philipp Sehmisch <tmw@crushnet.org> | 2008-05-21 21:44:27 +0000 |
commit | 0ac3b58c4c5079f22e6bf4b0efba7f5fe99565cd (patch) | |
tree | 6b2a208fac407cf5cf4ddcab2c5e1ebc2b9723dc /src/resources/mapreader.cpp | |
parent | 0c869fc47a30616967cb8b69af9ec772566d7076 (diff) | |
download | mana-client-0ac3b58c4c5079f22e6bf4b0efba7f5fe99565cd.tar.gz mana-client-0ac3b58c4c5079f22e6bf4b0efba7f5fe99565cd.tar.bz2 mana-client-0ac3b58c4c5079f22e6bf4b0efba7f5fe99565cd.tar.xz mana-client-0ac3b58c4c5079f22e6bf4b0efba7f5fe99565cd.zip |
Merged revisions 4013,4027,4043,4174,4250,4254 via svnmerge from
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/trunk
........
r4013 | crush_tmw | 2008-04-01 01:18:19 +0200 (Di, 01 Apr 2008) | 1 line
Implemented NPC XML database which maps NPC IDs to one or more animation files and thus enables animated NPCs.
........
r4027 | crush_tmw | 2008-04-02 01:34:14 +0200 (Mi, 02 Apr 2008) | 1 line
misspelled filename
........
r4043 | b_lindeijer | 2008-04-07 10:37:23 +0200 (Mo, 07 Apr 2008) | 3 lines
Added XML::Document class which simplifies parsing an XML document and
automatically cleans it up again.
........
r4174 | b_lindeijer | 2008-04-23 14:57:45 +0200 (Mi, 23 Apr 2008) | 2 lines
Fixed svn:keywords properties and added header to guild.h.
........
r4250 | crush_tmw | 2008-05-19 18:18:38 +0200 (Mo, 19 Mai 2008) | 1 line
Added the possibility to add particle effects to NPCs in npcs.xml.
........
r4254 | crush_tmw | 2008-05-20 15:58:26 +0200 (Di, 20 Mai 2008) | 1 line
fixed some filename confusion messup in the last commit.
........
NOTE: This was my first commit using svnmerge. Please check if I did everything correctly.
Diffstat (limited to 'src/resources/mapreader.cpp')
-rw-r--r-- | src/resources/mapreader.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp index 940ded36..2a080fb0 100644 --- a/src/resources/mapreader.cpp +++ b/src/resources/mapreader.cpp @@ -183,21 +183,19 @@ MapReader::readMap(const std::string &filename) inflatedSize = fileSize; } - xmlDocPtr doc = xmlParseMemory((char*) inflated, inflatedSize); + XML::Document doc((char*) inflated, inflatedSize); free(inflated); - // Parse the inflated map data - if (doc) { - xmlNodePtr node = xmlDocGetRootElement(doc); + xmlNodePtr node = doc.rootNode(); - if (!node || !xmlStrEqual(node->name, BAD_CAST "map")) { + // Parse the inflated map data + if (node) { + if (!xmlStrEqual(node->name, BAD_CAST "map")) { logger->log("Error: Not a map file (%s)!", filename.c_str()); } - else - { + else { map = readMap(node, filename); } - xmlFreeDoc(doc); } else { logger->log("Error while parsing map file (%s)!", filename.c_str()); } |