diff options
author | Andrei Karas <akaras@inbox.ru> | 2017-02-11 19:08:11 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2017-02-11 19:19:38 +0300 |
commit | 245fb04a1e112cc8d0918a8660474299d5ce223c (patch) | |
tree | eb5ab6266a4ff9551d2e08b9c14b61e353cd127f /src/dirs.cpp | |
parent | f978c1bed85961e102951340669ca873328bcef3 (diff) | |
download | mv-245fb04a1e112cc8d0918a8660474299d5ce223c.tar.gz mv-245fb04a1e112cc8d0918a8660474299d5ce223c.tar.bz2 mv-245fb04a1e112cc8d0918a8660474299d5ce223c.tar.xz mv-245fb04a1e112cc8d0918a8660474299d5ce223c.zip |
Split virtfs api for add directories and archives.
Also remove useless resourcemanager functions for add/remove virtfs entries.
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 f27bc76f9..ce20923b4 100644 --- a/src/dirs.cpp +++ b/src/dirs.cpp @@ -190,9 +190,9 @@ void Dirs::extractDataDir() void Dirs::mountDataDir() { - resourceManager->addToSearchPath(PKG_DATADIR "data/perserver/default", + VirtFs::addDirToSearchPath(PKG_DATADIR "data/perserver/default", Append_false); - resourceManager->addToSearchPath("data/perserver/default", + VirtFs::addDirToSearchPath("data/perserver/default", Append_false); #if defined __APPLE__ @@ -209,29 +209,29 @@ void Dirs::mountDataDir() CFRelease(resourcesURL); // possible crash strncat(path, "/data", PATH_MAX - 1); - resourceManager->addToSearchPath(path, Append_false); + VirtFs::addDirToSearchPath(path, Append_false); // possible this need for support run client from dmg images. // mPackageDir = path; #endif // defined __APPLE__ - resourceManager->addToSearchPath(PKG_DATADIR "data", Append_false); + VirtFs::addDirToSearchPath(PKG_DATADIR "data", Append_false); setPackageDir(PKG_DATADIR "data"); - resourceManager->addToSearchPath("data", Append_false); + VirtFs::addDirToSearchPath("data", Append_false); #ifdef ANDROID #ifdef USE_SDL2 if (getenv("APPDIR")) { const std::string appDir = getenv("APPDIR"); - resourceManager->addToSearchPath(appDir + "/data", Append_false); - resourceManager->addToSearchPath(appDir + "/data/perserver/default", + VirtFs::addDirToSearchPath(appDir + "/data", Append_false); + VirtFs::addDirToSearchPath(appDir + "/data/perserver/default", Append_false); } #endif // USE_SDL2 #endif // ANDROID #if defined __native_client__ - resourceManager->addToSearchPath("/http/data.zip", Append_false); + VirtFs::addZipToSearchPath("/http/data.zip", Append_false); #endif // defined __native_client__ // Add branding/data to PhysFS search path @@ -251,7 +251,7 @@ void Dirs::mountDataDir() if (loc > 0) { - resourceManager->addToSearchPath(path.substr( + VirtFs::addDirToSearchPath(path.substr( 0, loc + 1).append("data"), Append_false); } |