[Scummvm-cvs-logs] SF.net SVN: scummvm:[34432] scummvm/trunk

[fingolfin at users.sourceforge.net]

Revision: 34432
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34432&view=rev
Author:   fingolfin
Date:     2008-09-07 21:59:25 +0000 (Sun, 07 Sep 2008)

Log Message:
-----------
Add a priority param to OSystem::addSysArchivesToSearchSet (still in search for a better name ;)

Modified Paths:
--------------
    scummvm/trunk/backends/platform/sdl/sdl.cpp
    scummvm/trunk/backends/platform/sdl/sdl.h
    scummvm/trunk/common/system.h

Modified: scummvm/trunk/backends/platform/sdl/sdl.cpp
===================================================================
--- scummvm/trunk/backends/platform/sdl/sdl.cpp	2008-09-07 21:51:59 UTC (rev 34431)
+++ scummvm/trunk/backends/platform/sdl/sdl.cpp	2008-09-07 21:59:25 UTC (rev 34432)
@@ -275,7 +275,7 @@
 	return _fsFactory;
 }
 
-void OSystem_SDL::addSysArchivesToSearchSet(Common::SearchSet &s) {
+void OSystem_SDL::addSysArchivesToSearchSet(Common::SearchSet &s, uint priority) {
 
 #ifdef DATA_PATH
 	// Add the global DATA_PATH to the directory search list
@@ -283,7 +283,7 @@
 	Common::FilesystemNode dataNode(DATA_PATH);
 	if (dataNode.exists() && dataNode.isDirectory()) {
 		Common::ArchivePtr dataArchive(new Common::FSDirectory(dataNode, 4));
-		s.add(DATA_PATH, dataArchive);
+		s.add(DATA_PATH, dataArchive, priority);
 	}
 #endif
 
@@ -297,7 +297,7 @@
 			// Success: Add it to the search path
 			Common::String bundlePath((const char *)buf);
 			Common::ArchivePtr bundleArchive(new Common::FSDirectory(bundlePath));
-			s.add("__OSX_BUNDLE__", bundleArchive);
+			s.add("__OSX_BUNDLE__", bundleArchive, priority);
 		}
 		CFRelease(fileUrl);
 	}

Modified: scummvm/trunk/backends/platform/sdl/sdl.h
===================================================================
--- scummvm/trunk/backends/platform/sdl/sdl.h	2008-09-07 21:51:59 UTC (rev 34431)
+++ scummvm/trunk/backends/platform/sdl/sdl.h	2008-09-07 21:59:25 UTC (rev 34432)
@@ -209,7 +209,7 @@
 
 	virtual Common::SaveFileManager *getSavefileManager();
 	virtual FilesystemFactory *getFilesystemFactory();
-	virtual void addSysArchivesToSearchSet(Common::SearchSet &s);
+	virtual void addSysArchivesToSearchSet(Common::SearchSet &s, uint priority = 0);
 
 	virtual Common::SeekableReadStream *openConfigFileForReading();
 	virtual Common::WriteStream *openConfigFileForWriting();

Modified: scummvm/trunk/common/system.h
===================================================================
--- scummvm/trunk/common/system.h	2008-09-07 21:51:59 UTC (rev 34431)
+++ scummvm/trunk/common/system.h	2008-09-07 21:59:25 UTC (rev 34432)
@@ -914,9 +914,10 @@
 	 *
 	 * @todo Come up with a better name. This one sucks.
 	 *
-	 * @todo Allow specifying a priority with which the new dirs are added?
+	 * @param s		the SearchSet to which the system specific dirs, if any, are added
+	 * @param priority	the priority with which those dirs are added
 	 */
-	virtual void addSysArchivesToSearchSet(Common::SearchSet &s) {}
+	virtual void addSysArchivesToSearchSet(Common::SearchSet &s, uint priority = 0) {}
 
 	/**
 	 * Open the default config file for reading, by returning a suitable


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.