[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.440,1.441

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32697/simon

Modified Files:
	simon.cpp 
Log Message:

Ooops, make sure feature flags are updated.


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.440
retrieving revision 1.441
diff -u -d -r1.440 -r1.441
--- simon.cpp	30 Jul 2004 09:00:28 -0000	1.440
+++ simon.cpp	30 Jul 2004 09:15:18 -0000	1.441
@@ -153,30 +153,6 @@
 }
 
 Engine *Engine_SIMON_create(GameDetector *detector, OSystem *syst) {
-	const SimonGameSettings *g = simon_settings;
-	while (g->name) {
-		if (!scumm_stricmp(detector->_game.name, g->name))
-			break;
-		g++;
-	}
-	if (!g->name)
-		error("Invalid game '%s'\n", detector->_game.name);
-
-	SimonGameSettings game = *g;
-
-	switch (Common::parsePlatform(ConfMan.get("platform"))) {
-	case Common::kPlatformAmiga:
-	case Common::kPlatformMacintosh:
-		if (game.features & GF_SIMON2)
-			game.features |= GF_WIN;
-		break;
-	case Common::kPlatformWindows:
-		game.features |= GF_WIN;
-		break;
-	default:
-		break;
-	}
-
 	return new Simon::SimonEngine(detector, syst);
 }
 
@@ -285,7 +261,31 @@
 	_vc_ptr = 0;
 	_game_offsets_ptr = 0;
 	
-	_game = (byte)detector->_game.features;
+	const SimonGameSettings *g = simon_settings;
+	while (g->name) {
+		if (!scumm_stricmp(detector->_game.name, g->name))
+			break;
+		g++;
+	}
+	if (!g->name)
+		error("Invalid game '%s'\n", detector->_game.name);
+
+	SimonGameSettings game = *g;
+
+	switch (Common::parsePlatform(ConfMan.get("platform"))) {
+	case Common::kPlatformAmiga:
+	case Common::kPlatformMacintosh:
+		if (game.features & GF_SIMON2)
+			game.features |= GF_WIN;
+		break;
+	case Common::kPlatformWindows:
+		game.features |= GF_WIN;
+		break;
+	default:
+		break;
+	}
+
+	_game = game.features;
 
 	if (_game & GF_SIMON2) {
 		VGA_DELAY_BASE = 1;