diff options
author | Nicola Mettifogo | 2008-11-07 13:50:56 +0000 |
---|---|---|
committer | Nicola Mettifogo | 2008-11-07 13:50:56 +0000 |
commit | 71d7b5762a7f6fc0b889c25f3ab794116d903b53 (patch) | |
tree | b2fd4eca527b528046272f1fa6cb226561468872 | |
parent | 84b0d3d2f934b0c659ec40af2143e1d5751d9c4d (diff) | |
download | scummvm-rg350-71d7b5762a7f6fc0b889c25f3ab794116d903b53.tar.gz scummvm-rg350-71d7b5762a7f6fc0b889c25f3ab794116d903b53.tar.bz2 scummvm-rg350-71d7b5762a7f6fc0b889c25f3ab794116d903b53.zip |
Reverted my earlier commit r34926.
svn-id: r34930
-rw-r--r-- | backends/platform/sdl/sdl.cpp | 4 | ||||
-rw-r--r-- | common/archive.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp index 64766c2864..02c2efccdb 100644 --- a/backends/platform/sdl/sdl.cpp +++ b/backends/platform/sdl/sdl.cpp @@ -290,7 +290,7 @@ void OSystem_SDL::addSysArchivesToSearchSet(Common::SearchSet &s, int priority) // FIXME: We use depth = 4 for now, to match the old code. May want to change that Common::FSNode dataNode(DATA_PATH); if (dataNode.exists() && dataNode.isDirectory()) { - s.add(DATA_PATH, new Common::FSDirectory(dataNode, 4), priority, true); + s.add(DATA_PATH, new Common::FSDirectory(dataNode, 4), priority); } #endif @@ -303,7 +303,7 @@ void OSystem_SDL::addSysArchivesToSearchSet(Common::SearchSet &s, int priority) if (CFURLGetFileSystemRepresentation(fileUrl, true, buf, sizeof(buf))) { // Success: Add it to the search path Common::String bundlePath((const char *)buf); - s.add("__OSX_BUNDLE__", new Common::FSDirectory(bundlePath), priority, true); + s.add("__OSX_BUNDLE__", new Common::FSDirectory(bundlePath), priority); } CFRelease(fileUrl); } diff --git a/common/archive.cpp b/common/archive.cpp index 36687d4ec5..d494c6ceb4 100644 --- a/common/archive.cpp +++ b/common/archive.cpp @@ -433,7 +433,7 @@ void SearchManager::addDirectory(const String &name, const FSNode &dir, int prio if (!dir.exists() || !dir.isDirectory()) return; - add(name, new FSDirectory(dir, depth), priority, true); + add(name, new FSDirectory(dir, depth), priority); } void SearchManager::clear() { |