diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-03-09 03:31:42 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-03-09 03:31:42 +0300 |
| commit | 612873fa462d74a31bdd3977dac7919376038275 (patch) | |
| tree | 86c7ce3cb5a0d334bcba5d463846a88e03a8669e /src/dirs.cpp | |
| parent | 8470d3c82d84a6bd7767de6763153aa9cdfb991b (diff) | |
| download | plus-612873fa462d74a31bdd3977dac7919376038275.tar.gz plus-612873fa462d74a31bdd3977dac7919376038275.tar.bz2 plus-612873fa462d74a31bdd3977dac7919376038275.tar.xz plus-612873fa462d74a31bdd3977dac7919376038275.zip | |
Simplify add/remove dirs and zips methods in virtfs.
Diffstat (limited to 'src/dirs.cpp')
| -rw-r--r-- | src/dirs.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/dirs.cpp b/src/dirs.cpp index 052ba1dbb..a55953a0b 100644 --- a/src/dirs.cpp +++ b/src/dirs.cpp @@ -189,9 +189,9 @@ void Dirs::extractDataDir() void Dirs::mountDataDir() { - VirtFs::addDirToSearchPathSilent(PKG_DATADIR "data/perserver/default", + VirtFs::mountDirSilent(PKG_DATADIR "data/perserver/default", Append_false); - VirtFs::addDirToSearchPathSilent("data/perserver/default", + VirtFs::mountDirSilent("data/perserver/default", Append_false); #if defined __APPLE__ @@ -208,29 +208,29 @@ void Dirs::mountDataDir() CFRelease(resourcesURL); // possible crash strncat(path, "/data", PATH_MAX - 1); - VirtFs::addDirToSearchPath(path, Append_false); + VirtFs::mountDir(path, Append_false); // possible this need for support run client from dmg images. // mPackageDir = path; #endif // defined __APPLE__ - VirtFs::addDirToSearchPathSilent(PKG_DATADIR "data", Append_false); + VirtFs::mountDirSilent(PKG_DATADIR "data", Append_false); setPackageDir(PKG_DATADIR "data"); - VirtFs::addDirToSearchPathSilent("data", Append_false); + VirtFs::mountDirSilent("data", Append_false); #ifdef ANDROID #ifdef USE_SDL2 if (getenv("APPDIR")) { const std::string appDir = getenv("APPDIR"); - VirtFs::addDirToSearchPath(appDir + "/data", Append_false); - VirtFs::addDirToSearchPath(appDir + "/data/perserver/default", + VirtFs::mountDir(appDir + "/data", Append_false); + VirtFs::mountDir(appDir + "/data/perserver/default", Append_false); } #endif // USE_SDL2 #endif // ANDROID #if defined __native_client__ - VirtFs::addZipToSearchPath("/http/data.zip", Append_false); + VirtFs::mountZip("/http/data.zip", Append_false); #endif // defined __native_client__ // Add branding/data to PhysFS search path @@ -250,7 +250,7 @@ void Dirs::mountDataDir() if (loc > 0) { - VirtFs::addDirToSearchPath(path.substr( + VirtFs::mountDir(path.substr( 0, loc + 1).append("data"), Append_false); } |