From d5a00a320043f5782ebc489285c89943b667e094 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 12 May 2016 00:18:57 +0300 Subject: Add skipError parameter to loadXml functions. This allow not show errors for some not main xml files. --- src/resources/mapreader.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/resources/mapreader.cpp') diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp index 497817a7d..7c3c0a2ca 100644 --- a/src/resources/mapreader.cpp +++ b/src/resources/mapreader.cpp @@ -205,11 +205,12 @@ int inflateMemory(unsigned char *restrict const in, return outLength; } -void MapReader::addLayerToList(const std::string &fileName) +void MapReader::addLayerToList(const std::string &fileName, + const SkipError skipError) { XML::Document *doc = new XML::Document(fileName, UseResman_true, - SkipError_false); + skipError); XmlNodePtrConst node = doc->rootNode(); if (!node) { @@ -283,7 +284,7 @@ Map *MapReader::readMap(const std::string &restrict filename, void MapReader::loadLayers(const std::string &path) { BLOCK_START("MapReader::loadLayers") - loadXmlDir2(path, addLayerToList, ".tmx"); + loadXmlDir2(path, addLayerToList, ".tmx", SkipError_false); BLOCK_END("MapReader::loadLayers") } -- cgit v1.2.3-60-g2f50