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/dyetool/client.cpp  | 8 +++++---
 src/dyetool/dyemain.cpp | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'src/dyetool')

diff --git a/src/dyetool/client.cpp b/src/dyetool/client.cpp
index d32a08493..d2ace1a36 100644
--- a/src/dyetool/client.cpp
+++ b/src/dyetool/client.cpp
@@ -266,12 +266,13 @@ void Client::gameInit()
     // Add the main data directories to our PhysicsFS search path
     if (!settings.options.dataPath.empty())
     {
-        resourceManager->addToSearchPath(settings.options.dataPath,
+        VirtFs::addDirToSearchPath(settings.options.dataPath,
             Append_false);
     }
 
     // Add the local data directory to PhysicsFS search path
-    resourceManager->addToSearchPath(settings.localDataDir, Append_false);
+    VirtFs::addDirToSearchPath(settings.localDataDir,
+        Append_false);
     TranslationManager::loadCurrentLang();
 #ifdef ENABLE_CUSTOMNLS
     TranslationManager::loadGettextLang();
@@ -640,7 +641,8 @@ int Client::gameExec()
                             "zip",
                             Append_false);
 
-                        resourceManager->addToSearchPath(settings.localDataDir
+                        VirtFs::addDirToSearchPath(
+                            settings.localDataDir
                             + dirSeparator + settings.updatesDir + "/local/",
                             Append_false);
                     }
diff --git a/src/dyetool/dyemain.cpp b/src/dyetool/dyemain.cpp
index 7e0ed94a4..27b159a70 100644
--- a/src/dyetool/dyemain.cpp
+++ b/src/dyetool/dyemain.cpp
@@ -88,8 +88,8 @@ int main(int argc, char **argv)
 
     ResourceManager::init();
     resourceManager->setWriteDir(".");
-    resourceManager->addToSearchPath(".", Append_false);
-    resourceManager->addToSearchPath("/", Append_false);
+    VirtFs::addDirToSearchPath(".", Append_false);
+    VirtFs::addDirToSearchPath("/", Append_false);
     std::string src = argv[1];
     std::string dst;
     if (argc == 4)
-- 
cgit v1.2.3-60-g2f50