aboutsummaryrefslogtreecommitdiff
path: root/simon
diff options
context:
space:
mode:
authorTravis Howell2004-07-30 09:15:18 +0000
committerTravis Howell2004-07-30 09:15:18 +0000
commit130910a380836c012fb4bcc1632701423faf69a2 (patch)
treee4cb399f516431aff4935268f271e169b8f11c8f /simon
parentc6b037b9ed7e9bac002b458f57538ca6c4d6b730 (diff)
downloadscummvm-rg350-130910a380836c012fb4bcc1632701423faf69a2.tar.gz
scummvm-rg350-130910a380836c012fb4bcc1632701423faf69a2.tar.bz2
scummvm-rg350-130910a380836c012fb4bcc1632701423faf69a2.zip
Ooops, make sure feature flags are updated.
svn-id: r14362
Diffstat (limited to 'simon')
-rw-r--r--simon/simon.cpp50
1 files changed, 25 insertions, 25 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp
index 28acb6b7e2..134a8af351 100644
--- a/simon/simon.cpp
+++ b/simon/simon.cpp
@@ -153,30 +153,6 @@ DetectedGameList Engine_SIMON_detectGames(const FSList &fslist) {
}
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 @@ SimonEngine::SimonEngine(GameDetector *detector, OSystem *syst)
_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;