summaryrefslogtreecommitdiff
path: root/src/resources/mapreader.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-01-10 18:58:54 +0300
committerAndrei Karas <akaras@inbox.ru>2012-01-10 18:58:54 +0300
commit793a119a7a36f9680dad108e75075c8c4bd4a0d0 (patch)
treef995b989135dda75bcd45d8214571b4b4ed4e871 /src/resources/mapreader.cpp
parentbad730dd0de24b2b17b91922c0c7f2b31b7b4d9b (diff)
downloadmanaplus-793a119a7a36f9680dad108e75075c8c4bd4a0d0.tar.gz
manaplus-793a119a7a36f9680dad108e75075c8c4bd4a0d0.tar.bz2
manaplus-793a119a7a36f9680dad108e75075c8c4bd4a0d0.tar.xz
manaplus-793a119a7a36f9680dad108e75075c8c4bd4a0d0.zip
Replace all xmlNodePtr to XmlNodePtr.
Diffstat (limited to 'src/resources/mapreader.cpp')
-rw-r--r--src/resources/mapreader.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index 8c8bf2f9d..aa7bce59d 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -222,7 +222,7 @@ Map *MapReader::readMap(const std::string &filename,
XML::Document doc(reinterpret_cast<char*>(inflated), inflatedSize);
free(inflated);
- xmlNodePtr node = doc.rootNode();
+ XmlNodePtr node = doc.rootNode();
// Parse the inflated map data
if (node)
@@ -247,7 +247,7 @@ Map *MapReader::readMap(const std::string &filename,
return map;
}
-Map *MapReader::readMap(xmlNodePtr node, const std::string &path)
+Map *MapReader::readMap(XmlNodePtr node, const std::string &path)
{
if (!node)
return nullptr;
@@ -379,7 +379,7 @@ Map *MapReader::readMap(xmlNodePtr node, const std::string &path)
return map;
}
-void MapReader::readProperties(xmlNodePtr node, Properties *props)
+void MapReader::readProperties(XmlNodePtr node, Properties *props)
{
if (!node || !props)
return;
@@ -442,7 +442,7 @@ inline static void setTile(Map *map, MapLayer *layer, int x, int y, int gid)
}
}
-void MapReader::readLayer(xmlNodePtr node, Map *map)
+void MapReader::readLayer(XmlNodePtr node, Map *map)
{
// Layers are not necessarily the same size as the map
const int w = XML::getProperty(node, "width", map->getWidth());
@@ -491,7 +491,7 @@ void MapReader::readLayer(xmlNodePtr node, Map *map)
}
// Read base64 encoded map file
- xmlNodePtr dataChild = childNode->xmlChildrenNode;
+ XmlNodePtr dataChild = childNode->xmlChildrenNode;
if (!dataChild)
continue;
@@ -576,7 +576,7 @@ void MapReader::readLayer(xmlNodePtr node, Map *map)
}
else if (encoding == "csv")
{
- xmlNodePtr dataChild = childNode->xmlChildrenNode;
+ XmlNodePtr dataChild = childNode->xmlChildrenNode;
if (!dataChild)
continue;
@@ -646,7 +646,7 @@ void MapReader::readLayer(xmlNodePtr node, Map *map)
}
-Tileset *MapReader::readTileset(xmlNodePtr node, const std::string &path,
+Tileset *MapReader::readTileset(XmlNodePtr node, const std::string &path,
Map *map)
{
if (!map)