diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-04-03 02:12:42 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-04-03 18:44:58 +0300 |
| commit | 9e72886ee15acc39cbb6075ce32a60a5391ea9f3 (patch) | |
| tree | fd7d0b05eeaed5ab0016cad58772cab7456f36b4 /src/resources/mapreader.cpp | |
| parent | 49631972db5b965413d4bbe36983a8d5bd203183 (diff) | |
| download | mv-9e72886ee15acc39cbb6075ce32a60a5391ea9f3.tar.gz mv-9e72886ee15acc39cbb6075ce32a60a5391ea9f3.tar.bz2 mv-9e72886ee15acc39cbb6075ce32a60a5391ea9f3.tar.xz mv-9e72886ee15acc39cbb6075ce32a60a5391ea9f3.zip | |
Replace string::append with pathJoin.
Diffstat (limited to 'src/resources/mapreader.cpp')
| -rw-r--r-- | src/resources/mapreader.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp index 307364457..84dff3140 100644 --- a/src/resources/mapreader.cpp +++ b/src/resources/mapreader.cpp @@ -337,8 +337,8 @@ Map *MapReader::readMap(XmlNodePtrConst node, const std::string &path) const int tileh = XML::getProperty(node, "tileheight", -1); const bool showWarps = config.getBoolValue("warpParticle"); - const std::string warpPath = paths.getStringValue("particles") - .append(paths.getStringValue("portalEffectFile")); + const std::string warpPath = pathJoin(paths.getStringValue("particles"), + paths.getStringValue("portalEffectFile")); if (tilew < 0 || tileh < 0) { @@ -1280,7 +1280,7 @@ void MapReader::updateMusic(Map *const map) if (p != std::string::npos) name = name.substr(0, p); name.append(".ogg"); - if (VirtFs::exists(paths.getStringValue("music").append(name))) + if (VirtFs::exists(pathJoin(paths.getStringValue("music"), name))) map->setProperty("music", name); } |