diff options
author | Johannes Schickel | 2010-07-05 21:18:25 +0000 |
---|---|---|
committer | Johannes Schickel | 2010-07-05 21:18:25 +0000 |
commit | 0c3cbcbfc57c6c355d7106aa6be3faa7dd2f8590 (patch) | |
tree | 484f4657e8ffb116cc7ee45193bac362f5227a29 /engines/scumm | |
parent | edac80ad6bd785e4925764bdd1bea2084aefc143 (diff) | |
download | scummvm-rg350-0c3cbcbfc57c6c355d7106aa6be3faa7dd2f8590.tar.gz scummvm-rg350-0c3cbcbfc57c6c355d7106aa6be3faa7dd2f8590.tar.bz2 scummvm-rg350-0c3cbcbfc57c6c355d7106aa6be3faa7dd2f8590.zip |
Prevent SCUMM from adding gui options based on user flags into the config file (regression from r50706).
svn-id: r50710
Diffstat (limited to 'engines/scumm')
-rw-r--r-- | engines/scumm/detection.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/engines/scumm/detection.cpp b/engines/scumm/detection.cpp index c3a9120093..9721c75677 100644 --- a/engines/scumm/detection.cpp +++ b/engines/scumm/detection.cpp @@ -1005,6 +1005,10 @@ Common::Error ScummMetaEngine::createInstance(OSystem *syst, Engine **engine) co debug(1, "Using MD5 '%s'", res.md5.c_str()); } + // If the GUI options were updated, we catch this here and update them in the users config + // file transparently. + Common::updateGameGUIOptions(res.game.guioptions, getGameGUIOptionsDescriptionLanguage(res.language)); + // Check for a user override of the platform. We allow the user to override // the platform, to make it possible to add games which are not yet in // our MD5 database but require a specific platform setting. @@ -1021,11 +1025,6 @@ Common::Error ScummMetaEngine::createInstance(OSystem *syst, Engine **engine) co // TODO: Maybe allow the null driver, too? if (res.game.platform == Common::kPlatformFMTowns && res.game.version == 3) res.game.midi = MDT_TOWNS; - - // If the GUI options were updated, we catch this here and update them in the users config - // file transparently. - Common::updateGameGUIOptions(res.game.guioptions, getGameGUIOptionsDescriptionLanguage(res.language)); - // Finally, we have massaged the GameDescriptor to our satisfaction, and can // instantiate the appropriate game engine. Hooray! switch (res.game.version) { |