Merged 0.0 changes from revision 3065 to 3177 to trunk.

2 files changed, 35 insertions, 0 deletions

diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index 45067302..2059a5c3 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -112,6 +112,33 @@ ResourceManager::addToSearchPath(const std::string &path, bool append)
     PHYSFS_addToSearchPath(path.c_str(), append ? 1 : 0);
 }
 
+void
+ResourceManager::searchAndAddArchives(const std::string &path,
+                                      const std::string &ext,
+                                      bool append)
+{
+    const char *dirSep = PHYSFS_getDirSeparator();
+    char **list = PHYSFS_enumerateFiles(path.c_str());
+
+    for (char **i = list; *i != NULL; i++)
+    {
+        size_t len = strlen(*i);
+
+        if (len > ext.length() && !ext.compare((*i)+(len - ext.length())))
+        {
+            std::string file, realPath, archive;
+
+            file = path + (*i);
+            realPath = std::string(PHYSFS_getRealDir(file.c_str()));
+            archive = realPath + dirSep + file;
+
+            addToSearchPath(archive, append);
+        }
+    }
+
+    PHYSFS_freeList(list);
+}
+
 bool
 ResourceManager::mkdir(const std::string &path)
 {
diff --git a/src/resources/resourcemanager.h b/src/resources/resourcemanager.h
index d458f96e..e176e337 100644
--- a/src/resources/resourcemanager.h
+++ b/src/resources/resourcemanager.h
@@ -83,6 +83,14 @@ class ResourceManager
         addToSearchPath(const std::string &path, bool append);
 
         /**
+        * Searches for zip files and adds them to the search path.
+        */
+        void
+        searchAndAddArchives(const std::string &path,
+                             const std::string &ext,
+                             bool append);
+
+        /**
          * Creates a directory in the write path
          */
         bool