[Scummvm-cvs-logs] CVS: scummvm/backends/dc selector.cpp,1.20,1.20.2.1

[Marcus Comstedt]

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

Modified Files:
      Tag: branch-0-6-0
	selector.cpp 
Log Message:
Trust the checksum.

Index: selector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/dc/selector.cpp,v
retrieving revision 1.20
retrieving revision 1.20.2.1
diff -u -d -r1.20 -r1.20.2.1
--- selector.cpp	5 Feb 2004 00:19:43 -0000	1.20
+++ selector.cpp	13 Mar 2004 12:39:14 -0000	1.20.2.1
@@ -160,7 +160,7 @@
   return false;
 }
 
-static const char *checkDetect(const FilesystemNode *entry)
+static const char *checkDetect(const FilesystemNode *entry, bool unique)
 {
   FSList files;
   files.push_back(*entry);
@@ -173,18 +173,24 @@
   }
   if (candidates.isEmpty())
     return NULL;
+  if (unique && candidates.size() > 1)
+    return NULL;
   return candidates[0].name;
 }
 
 static bool isGame(const FilesystemNode *entry, char *base)
 {
   const char *fn = entry->displayName().c_str();
+  if(const char *dtct = checkDetect(entry, true)) {
+    strcpy(base, dtct);
+    return true;
+  }
   if(!strcasecmp(fn, "00.LFL") ||
      !strcasecmp(fn, "000.LFL")) {
     *base = '\0';
     return true;
   }
-  if(const char *dtct = checkDetect(entry)) {
+  if(const char *dtct = checkDetect(entry, false)) {
     strcpy(base, dtct);
     return true;
   }
@@ -198,7 +204,7 @@
     base[l-4]='\0';
     return true;
   }
-#else
+#elsif 0
   char *dot;
   if(!stricmp(fn, "LOOM.EXE"))
     return false;
@@ -306,8 +312,10 @@
 		games[curr_game].dir[i+1]='\0';
 #endif
 	      }
+#if 0
 	      if(checkExe(games[curr_game].dir, "loom"))
 		strcpy(games[curr_game].filename_base, "loomcd");
+#endif
 	    }
 	    if(uniqueGame(games[curr_game].filename_base,
 			  games[curr_game].dir, games, curr_game)) {