[Scummvm-cvs-logs] CVS: scummvm/backends/fs fs.h,1.28,1.29

Torbjörn Andersson eriktorbjorn at users.sourceforge.net
Sun Apr 10 07:34:06 CEST 2005


Update of /cvsroot/scummvm/scummvm/backends/fs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11090/backends/fs

Modified Files:
	fs.h 
Log Message:
Applied patch #1175374 ("FluidSynth MIDI driver"), with a few documentation 
changes. There are a few things that could use a bit more work, and I've
only tested it on my Linux box. I have verified that ScummVM still compiles
when it's disabled, though, so it shouldn't break anything too badly.


Index: fs.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/fs/fs.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- fs.h	6 Feb 2005 18:37:22 -0000	1.28
+++ fs.h	10 Apr 2005 14:33:42 -0000	1.29
@@ -131,10 +131,15 @@
 	virtual FSList listDir(ListMode mode = kListDirectoriesOnly) const = 0;
 
 	/**
-	 * Compare the name of this node to the name of another.
+	 * Compare the name of this node to the name of another. Directories
+	 * go before normal files.
 	 */
 	virtual bool operator< (const AbstractFilesystemNode& node) const
 	{
+		if (isDirectory() && !node.isDirectory())
+			return true;
+		if (!isDirectory() && node.isDirectory())
+			return false;
 		return scumm_stricmp(displayName().c_str(), node.displayName().c_str()) < 0;
 	}
 





More information about the Scummvm-git-logs mailing list