[Scummvm-cvs-logs] SF.net SVN: scummvm: [25548] scummvm/trunk/common/advancedDetector.cpp

[fingolfin at users.sourceforge.net]

Revision: 25548
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25548&view=rev
Author:   fingolfin
Date:     2007-02-13 07:03:43 -0800 (Tue, 13 Feb 2007)

Log Message:
-----------
Thanks to the previous changes, we can now cleanup detectGameForEngineCreation somewhat

Modified Paths:
--------------
    scummvm/trunk/common/advancedDetector.cpp

Modified: scummvm/trunk/common/advancedDetector.cpp
===================================================================
--- scummvm/trunk/common/advancedDetector.cpp	2007-02-13 14:55:11 UTC (rev 25547)
+++ scummvm/trunk/common/advancedDetector.cpp	2007-02-13 15:03:43 UTC (rev 25548)
@@ -231,14 +231,15 @@
 		return kInvalidPathError;
 	}
 
-	GameList detectedGames = detectAllGames(fslist, params);
+	Common::ADList matches = detectGame(&fslist, params, Common::UNK_LANG, Common::kPlatformUnknown);
 
 	// We have single ID set, so we have a game if there are hits
-	if (params.singleid != NULL && detectedGames.size())
+	if (params.singleid != NULL && matches.size())
 		return kNoError;
 
-	for (uint i = 0; i < detectedGames.size(); i++) {
-		if (detectedGames[i].gameid() == gameid) {
+	for (uint i = 0; i < matches.size(); i++) {
+		const ADGameDescription *adgDesc = (const ADGameDescription *)(params.descs + matches[i] * params.descItemSize);
+		if (adgDesc->gameid == gameid) {
 			return kNoError;
 		}
 	}


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