aboutsummaryrefslogtreecommitdiff
path: root/common/file.cpp
diff options
context:
space:
mode:
authorMax Horn2008-10-22 17:08:17 +0000
committerMax Horn2008-10-22 17:08:17 +0000
commitf881b95dddd5b9a2bf15179a2b4376f551a20bff (patch)
treea971539116d4b8b72429180bff84066d6f48c19d /common/file.cpp
parent2630e964c9de8558ec70a6530a6d081164f4a720 (diff)
downloadscummvm-rg350-f881b95dddd5b9a2bf15179a2b4376f551a20bff.tar.gz
scummvm-rg350-f881b95dddd5b9a2bf15179a2b4376f551a20bff.tar.bz2
scummvm-rg350-f881b95dddd5b9a2bf15179a2b4376f551a20bff.zip
Removed File::addDefaultDirectoryRecursive, tweaked SearchMan API slightly
svn-id: r34836
Diffstat (limited to 'common/file.cpp')
-rw-r--r--common/file.cpp23
1 files changed, 3 insertions, 20 deletions
diff --git a/common/file.cpp b/common/file.cpp
index ed432ce565..abb2cda494 100644
--- a/common/file.cpp
+++ b/common/file.cpp
@@ -33,28 +33,11 @@ namespace Common {
void File::addDefaultDirectory(const String &directory) {
FSNode dir(directory);
- addDefaultDirectoryRecursive(dir, 1);
+ addDefaultDirectory(dir);
}
-void File::addDefaultDirectoryRecursive(const String &directory, int level) {
- FSNode dir(directory);
- addDefaultDirectoryRecursive(dir, level);
-}
-
-void File::addDefaultDirectory(const FSNode &directory) {
- addDefaultDirectoryRecursive(directory, 1);
-}
-
-void File::addDefaultDirectoryRecursive(const FSNode &dir, int level) {
- if (level <= 0 || !dir.exists() || !dir.isDirectory())
- return;
-
- Common::ArchivePtr dataArchive(new Common::FSDirectory(dir, level));
- SearchMan.add(dir.getPath(), dataArchive);
-}
-
-void File::resetDefaultDirectories() {
- SearchMan.clear();
+void File::addDefaultDirectory(const FSNode &dir) {
+ SearchMan.addDirectory(dir.getPath(), dir);
}
File::File()