diff --git a/tmxlite/src/Object.cpp b/tmxlite/src/Object.cpp index ef54743..d179c47 100644 --- a/tmxlite/src/Object.cpp +++ b/tmxlite/src/Object.cpp @@ -222,7 +222,7 @@ void Object::parseTemplate(const std::string& path, Map* map) //load the template if not already loaded if (templateObjects.count(path) == 0) { - auto templatePath = map->getWorkingDirectory() + "/" + path; + auto templatePath = resolveFilePath(path, map->getWorkingDirectory()); pugi::xml_document doc; if (!doc.load_file(templatePath.c_str())) @@ -247,7 +247,8 @@ void Object::parseTemplate(const std::string& path, Map* map) if (!tilesetName.empty() && templateTilesets.count(tilesetName) == 0) { - templateTilesets.insert(std::make_pair(tilesetName, Tileset(map->getWorkingDirectory()))); + //tileset source is relative to the template file, not the map + templateTilesets.insert(std::make_pair(tilesetName, Tileset(getFilePath(templatePath)))); templateTilesets.at(tilesetName).parse(tileset, map); } }