From 63f37017719d01f9ea72fb1f1e1722918a368755 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 13 Feb 2017 15:25:21 +0300 Subject: Remove from resourcemanager function for add/remove archives from directory. --- src/resources/resourcemanager/resourcemanager.cpp | 46 ----------------------- src/resources/resourcemanager/resourcemanager.h | 15 -------- 2 files changed, 61 deletions(-) (limited to 'src/resources') diff --git a/src/resources/resourcemanager/resourcemanager.cpp b/src/resources/resourcemanager/resourcemanager.cpp index 530d45902..244f657e2 100644 --- a/src/resources/resourcemanager/resourcemanager.cpp +++ b/src/resources/resourcemanager/resourcemanager.cpp @@ -335,52 +335,6 @@ void ResourceManager::clearDeleted(const bool full) } } -void ResourceManager::searchAndAddArchives(const std::string &restrict path, - const std::string &restrict ext, - const Append append) const -{ - const char *const dirSep = dirSeparator; - char **list = VirtFs::enumerateFiles(path.c_str()); - - for (char **i = list; *i; i++) - { - const size_t len = strlen(*i); - - if (len > ext.length() && !ext.compare((*i) + (len - ext.length()))) - { - const std::string file = path + (*i); - const std::string realPath = std::string( - VirtFs::getRealDir(file.c_str())); - VirtFs::addZipToSearchPath(std::string(realPath).append( - dirSep).append(file), append); - } - } - - VirtFs::freeList(list); -} - -void ResourceManager::searchAndRemoveArchives(const std::string &restrict path, - const std::string &restrict ext) - const -{ - const char *const dirSep = dirSeparator; - char **list = VirtFs::enumerateFiles(path.c_str()); - - for (char **i = list; *i; i++) - { - const size_t len = strlen(*i); - if (len > ext.length() && !ext.compare((*i) + (len - ext.length()))) - { - const std::string file = path + (*i); - const std::string realPath = std::string( - VirtFs::getRealDir(file.c_str())); - VirtFs::removeZipFromSearchPath(std::string(realPath).append( - dirSep).append(file)); - } - } - - VirtFs::freeList(list); -} bool ResourceManager::addResource(const std::string &idPath, Resource *const resource) diff --git a/src/resources/resourcemanager/resourcemanager.h b/src/resources/resourcemanager/resourcemanager.h index b9732947f..6fff83df0 100644 --- a/src/resources/resourcemanager/resourcemanager.h +++ b/src/resources/resourcemanager/resourcemanager.h @@ -25,8 +25,6 @@ #include "resources/memorycounter.h" -#include "enums/simpletypes/append.h" - #include #include @@ -59,19 +57,6 @@ class ResourceManager final : public MemoryCounter */ ~ResourceManager(); - /** - * Searches for zip files and adds them to the search path. - */ - void searchAndAddArchives(const std::string &restrict path, - const std::string &restrict ext, - const Append append) const; - - /** - * Searches for zip files and remove them from the search path. - */ - void searchAndRemoveArchives(const std::string &restrict path, - const std::string &restrict ext) const; - /** * Creates a resource and adds it to the resource map. * -- cgit v1.2.3-70-g09d2