From 37900285377966500d4f97a67dc37327f097ff8a Mon Sep 17 00:00:00 2001 From: Ira Rice Date: Wed, 3 Dec 2008 15:00:30 -0700 Subject: Changed tileset code so that it removes all ... paths. This assumes that the tileset to be loaded will not be in a different root directory than the tsx file. Signed-off-by: Ira Rice --- src/resources/mapreader.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp index b1068510..894cc4fc 100644 --- a/src/resources/mapreader.cpp +++ b/src/resources/mapreader.cpp @@ -470,7 +470,8 @@ MapReader::readTileset(xmlNodePtr node, if (!source.empty()) { std::string sourceStr = source; - sourceStr.erase(0, 3); // Remove "../" + while (sourceStr.substr(0, 3) == "../") + sourceStr.erase(0, 3); // Remove "../" ResourceManager *resman = ResourceManager::getInstance(); Image* tilebmp = resman->getImage(sourceStr); @@ -479,8 +480,7 @@ MapReader::readTileset(xmlNodePtr node, { Tileset *set = new Tileset(tilebmp, tw, th, firstGid); tilebmp->decRef(); - if (doc) - delete doc; + delete doc; return set; } else { @@ -492,8 +492,7 @@ MapReader::readTileset(xmlNodePtr node, break; } - if (doc) - delete doc; + delete doc; return NULL; } -- cgit v1.2.3-70-g09d2