From 245fb04a1e112cc8d0918a8660474299d5ce223c Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 11 Feb 2017 19:08:11 +0300
Subject: Split virtfs api for add directories and archives.

Also remove useless resourcemanager functions for add/remove virtfs entries.
---
 src/dirs.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/dirs.cpp')

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);
         }
-- 
cgit v1.2.3-70-g09d2