[Scummvm-cvs-logs] SF.net SVN: scummvm: [22246] scummvm/trunk/engines/scumm/plugin.cpp

[fingolfin at users.sourceforge.net]

Revision: 22246
Author:   fingolfin
Date:     2006-04-30 08:06:17 -0700 (Sun, 30 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22246&view=rev

Log Message:
-----------
Honor the 'platform' override when choosing between game variants (this should help fan translations of certain FM-TOWNS games)

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/plugin.cpp
Modified: scummvm/trunk/engines/scumm/plugin.cpp
===================================================================
--- scummvm/trunk/engines/scumm/plugin.cpp	2006-04-30 14:39:39 UTC (rev 22245)
+++ scummvm/trunk/engines/scumm/plugin.cpp	2006-04-30 15:06:17 UTC (rev 22246)
@@ -1318,37 +1318,37 @@
 		return kNoGameDataFoundError;
 	}
 	
-	DetectorResult res(*(results.begin()));
-
-/*
 	// No unique match found. If a platform override is present, try to
 	// narrow down the list a bit more.
 	if (results.size() > 1 && ConfMan.hasKey("platform")) {
 		Common::Platform platform = Common::parsePlatform(ConfMan.get("platform"));
 		for (Common::List<DetectorResult>::iterator x = results.begin(); x != results.end(); ) {
-			if (x->game.platform != platform)
+			if (x->game.platform != platform) {
 				x = results.erase(x); 
-			else
+			} else {
 				++x;
+			}
 		}
 	}
-*/
 
 	// Still no unique match found -> we just use the first one
 	if (results.size() > 1) {
 		warning("Engine_SCUMM_create: No unique game candidate found, using first one");
 	}
 	
+
+	DetectorResult res(*(results.begin()));
+	debug(1, "Using gameid %s, variant %s, extra %s", res.game.gameid, res.game.variant, res.extra);
+
 	// Print the MD5 of the game; either verbose using printf, in case of an
 	// unknown MD5, or with a medium debug level in case of a known MD5 (for
 	// debugging purposes).
 	if (!findInMD5Table(res.md5.c_str())) {
 		printf("Unknown MD5 (%s)! Please report the details (language, platform, etc.) of this game to the ScummVM team\n", res.md5.c_str());
 	} else {
-		debug(5, "Using MD5 '%s'", res.md5.c_str());
+		debug(1, "Using MD5 '%s'", res.md5.c_str());
 	}
 
-
 	// TODO: Do we really still need / want the platform override ?
 
 


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