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

[fingolfin at users.sourceforge.net]

Revision: 29961
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29961&view=rev
Author:   fingolfin
Date:     2007-12-23 06:43:15 -0800 (Sun, 23 Dec 2007)

Log Message:
-----------
Fix for bug #1842260: INDY3 FM-TOWNS: Modified version does not start (what a beautiful & embarrassing endless loop that was...)

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/detection.cpp

Modified: scummvm/trunk/engines/scumm/detection.cpp
===================================================================
--- scummvm/trunk/engines/scumm/detection.cpp	2007-12-23 12:27:43 UTC (rev 29960)
+++ scummvm/trunk/engines/scumm/detection.cpp	2007-12-23 14:43:15 UTC (rev 29961)
@@ -445,7 +445,7 @@
 
 	Common::File tmp;
 	if (!tmp.open(d.node)) {
-		warning("SCUMM detectGames: failed to open '%s' for read access", d.node.getPath().c_str());
+		warning("SCUMM testGame: failed to open '%s' for read access", d.node.getPath().c_str());
 		return false;
 	}
 
@@ -680,7 +680,8 @@
 	// TODO: We still don't handle the FM-TOWNS demos (like zakloom) very well.
 	// In particular, they are detected as ZakTowns, which is bad.
 
-	for (Common::List<DetectorResult>::iterator x = results.begin(); x != results.end(); ++x) {
+	for (Common::List<DetectorResult>::iterator
+	          x = results.begin(); x != results.end(); ++x) {
 		const PlainGameDescriptor *g = findPlainGameDescriptor(x->game.gameid, gameDescriptions);
 		assert(g);
 		GameDescriptor dg(x->game.gameid, g->description, x->language, x->game.platform);
@@ -769,7 +770,8 @@
 		Common::List<DetectorResult> tmp;
 
 		// Copy only those candidates which match the platform setting
-		for (Common::List<DetectorResult>::iterator x = results.begin(); x != results.end(); ) {
+		for (Common::List<DetectorResult>::iterator
+		          x = results.begin(); x != results.end(); ++x) {
 			if (x->game.platform == platform) {
 				tmp.push_back(*x);
 			}


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