[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.282,1.283

Robert Göffringmann lavosspawn at users.sourceforge.net
Thu Dec 9 07:08:09 CET 2004


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11272/scumm

Modified Files:
	scumm.cpp 
Log Message:
Pass subdirectories to gamedetector functions

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.282
retrieving revision 1.283
diff -u -d -r1.282 -r1.283
--- scumm.cpp	3 Dec 2004 13:17:57 -0000	1.282
+++ scumm.cpp	9 Dec 2004 15:06:44 -0000	1.283
@@ -2678,13 +2678,15 @@
 
 		// Iterate over all files in the given directory
 		for (FSList::const_iterator file = fslist.begin(); file != fslist.end(); ++file) {
-			const char *name = file->displayName().c_str();
+			if (!file->isDirectory()) {
+				const char *name = file->displayName().c_str();
 
-			if (0 == scumm_stricmp(detectName, name)) {
-				// Match found, add to list of candidates, then abort inner loop.
-				detectedGames.push_back(g->toGameSettings());
-				fileSet.addKey(file->path());
-				break;
+				if (0 == scumm_stricmp(detectName, name)) {
+					// Match found, add to list of candidates, then abort inner loop.
+					detectedGames.push_back(g->toGameSettings());
+					fileSet.addKey(file->path());
+					break;
+				}
 			}
 		}
 	}





More information about the Scummvm-git-logs mailing list