summaryrefslogtreecommitdiff
path: root/src/dyetool
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-04-02 06:23:19 +0300
committerAndrei Karas <akaras@inbox.ru>2017-04-03 18:44:58 +0300
commit49631972db5b965413d4bbe36983a8d5bd203183 (patch)
treecb31545521cb4b33e65f8e94e7f2d5cd33e9e7a1 /src/dyetool
parentbe7786e70668c014b19263895a6c8f507ed8161d (diff)
downloadmv-49631972db5b965413d4bbe36983a8d5bd203183.tar.gz
mv-49631972db5b965413d4bbe36983a8d5bd203183.tar.bz2
mv-49631972db5b965413d4bbe36983a8d5bd203183.tar.xz
mv-49631972db5b965413d4bbe36983a8d5bd203183.zip
Use pathJoin for concatinate some paths.
Diffstat (limited to 'src/dyetool')
-rw-r--r--src/dyetool/client.cpp18
1 files changed, 12 insertions, 6 deletions
diff --git a/src/dyetool/client.cpp b/src/dyetool/client.cpp
index 8be7b125e..f618db321 100644
--- a/src/dyetool/client.cpp
+++ b/src/dyetool/client.cpp
@@ -159,9 +159,14 @@ void Client::gameInit()
// Configure logger
if (!settings.options.logFileName.empty())
+ {
settings.logFileName = settings.options.logFileName;
+ }
else
- settings.logFileName = settings.localDataDir + "/manaplus.log";
+ {
+ settings.logFileName = pathJoin(settings.localDataDir,
+ "manaplus.log");
+ }
logger->setLogFile(settings.logFileName);
#ifdef USE_FUZZER
@@ -640,14 +645,15 @@ int Client::gameExec()
if (!settings.options.skipUpdate)
{
- VirtFs::searchAndAddArchives(
- settings.updatesDir + "/local/",
+ VirtFs::searchAndAddArchives(pathJoin(
+ settings.updatesDir, "local/"),
"zip",
Append_false);
- VirtFs::mountDir(
- settings.localDataDir
- + dirSeparator + settings.updatesDir + "/local/",
+ VirtFs::mountDir(pathJoin(
+ settings.localDataDir,
+ settings.updatesDir,
+ "local/"),
Append_false);
}