aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2007-12-23 14:43:15 +0000
committerMax Horn2007-12-23 14:43:15 +0000
commitd3f01bb79ad55eb8add21d8406139471c82254ee (patch)
treebf069aeac82f184648911992b40e9805e731d05a
parentd6788c3291541761be6043407efaa1856da68449 (diff)
downloadscummvm-rg350-d3f01bb79ad55eb8add21d8406139471c82254ee.tar.gz
scummvm-rg350-d3f01bb79ad55eb8add21d8406139471c82254ee.tar.bz2
scummvm-rg350-d3f01bb79ad55eb8add21d8406139471c82254ee.zip
Fix for bug #1842260: INDY3 FM-TOWNS: Modified version does not start (what a beautiful & embarrassing endless loop that was...)
svn-id: r29961
-rw-r--r--engines/scumm/detection.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/engines/scumm/detection.cpp b/engines/scumm/detection.cpp
index 544d2d2392..02d0d23666 100644
--- a/engines/scumm/detection.cpp
+++ b/engines/scumm/detection.cpp
@@ -445,7 +445,7 @@ static bool testGame(const GameSettings *g, const DescMap &fileMD5Map, const Com
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 @@ GameList Engine_SCUMM_detectGames(const FSList &fslist) {
// 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 @@ PluginError Engine_SCUMM_create(OSystem *syst, Engine **engine) {
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);
}