thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor GUI options update into a function in Common: updateGameGUIOptions.

Browse source 
svn-id: r42446
This commit is contained in:
Johannes Schickel 2009-07-13 18:47:32 +00:00
parent 88e0fc2c43
commit 51a9bfc9e2
4 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
engines/advancedDetector.cpp
View file

@ -296,13 +296,7 @@ Common::Error AdvancedMetaEngine::createInstance(OSystem *syst, Engine **engine)
// If the GUI options were updated, we catch this here and update them in the users config
// file transparently.
const uint32 guiOptions = agdDesc->guioptions | params.guioptions;
if ((guiOptions && !ConfMan.hasKey("guioptions")) ||
(ConfMan.hasKey("guioptions") && parseGameGUIOptions(ConfMan.get("guioptions")) != guiOptions)) {
ConfMan.set("guioptions", Common::getGameGUIOptionsDescription(guiOptions));
ConfMan.flushToDisk();
}
Common::updateGameGUIOptions(agdDesc->guioptions | params.guioptions);
debug(2, "Running %s", toGameDescriptor(*agdDesc, params.list).description().c_str());
if (!createInstance(syst, engine, agdDesc))