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

[fingolfin at users.sourceforge.net]

Revision: 25452
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25452&view=rev
Author:   fingolfin
Date:     2007-02-09 09:57:49 -0800 (Fri, 09 Feb 2007)

Log Message:
-----------
cleanup

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

Modified: scummvm/trunk/common/advancedDetector.cpp
===================================================================
--- scummvm/trunk/common/advancedDetector.cpp	2007-02-09 17:47:55 UTC (rev 25451)
+++ scummvm/trunk/common/advancedDetector.cpp	2007-02-09 17:57:49 UTC (rev 25452)
@@ -163,9 +163,7 @@
  * Makes gameid in form of
  * gameid-plaform-lang
  */
-static String generateComplexID(const String id, int listPos, const Common::ADParams &params) {
-	const ADGameDescription *desc = (const ADGameDescription *)(params.descs + listPos * params.descItemSize);
-
+static String generateComplexID(const String &id, const ADGameDescription *desc) {
 	String res(id);
 
 	if (desc->platform != kPlatformPC && desc->platform != kPlatformUnknown) {
@@ -187,7 +185,8 @@
 
 	GameList detectedGames;
 	for (uint i = 0; i < matches.size(); i++) {
-		GameDescriptor desc(toGameDescriptor(*(const ADGameDescription *)(params.descs + matches[i] * params.descItemSize), params.list));
+		const ADGameDescription *adgDesc = (const ADGameDescription *)(params.descs + matches[i] * params.descItemSize);
+		GameDescriptor desc(toGameDescriptor(*adgDesc, params.list));
 
 		if (params.singleid != NULL) {
 			desc["preferredtarget"] = desc["gameid"];
@@ -198,7 +197,7 @@
 			if (!desc.contains("preferredtarget"))
 				desc["preferredtarget"] = desc["gameid"];
 
-			desc["preferredtarget"] = generateComplexID(desc["preferredtarget"], matches[i], params);
+			desc["preferredtarget"] = generateComplexID(desc["preferredtarget"], adgDesc);
 		}
 
 		detectedGames.push_back(desc);


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