aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2009-06-06 19:47:55 +0000
committerJohannes Schickel2009-06-06 19:47:55 +0000
commit24a512cab08a12eb2b8f3b759d7f3d82c6853a21 (patch)
tree60182f95ff374c79761d05e71fc47cbfbdb6714e
parente8463ff1d2a4407473b32e1a580f99df3cd601b3 (diff)
downloadscummvm-rg350-24a512cab08a12eb2b8f3b759d7f3d82c6853a21.tar.gz
scummvm-rg350-24a512cab08a12eb2b8f3b759d7f3d82c6853a21.tar.bz2
scummvm-rg350-24a512cab08a12eb2b8f3b759d7f3d82c6853a21.zip
Use GameDescriptor::setGUIOptions instead of setting key "guioptions" directly.
svn-id: r41297
-rw-r--r--engines/advancedDetector.cpp3
-rw-r--r--engines/scumm/detection.cpp3
2 files changed, 2 insertions, 4 deletions
diff --git a/engines/advancedDetector.cpp b/engines/advancedDetector.cpp
index b3ce525ff2..c127faec28 100644
--- a/engines/advancedDetector.cpp
+++ b/engines/advancedDetector.cpp
@@ -198,8 +198,7 @@ static void updateGameDescriptor(GameDescriptor &desc, const ADGameDescription *
if (params.flags & kADFlagUseExtraAsHint)
desc["extra"] = realDesc->extra;
- if ((realDesc->guioptions | params.guioptions) != 0)
- desc["guioptions"] = Common::getGameGUIOptionsDescription(realDesc->guioptions | params.guioptions);
+ desc.setGUIOptions(realDesc->guioptions | params.guioptions);
}
GameList AdvancedMetaEngine::detectGames(const Common::FSList &fslist) const {
diff --git a/engines/scumm/detection.cpp b/engines/scumm/detection.cpp
index 901bb31e31..cf88ded3b8 100644
--- a/engines/scumm/detection.cpp
+++ b/engines/scumm/detection.cpp
@@ -765,8 +765,7 @@ GameList ScummMetaEngine::detectGames(const Common::FSList &fslist) const {
dg["preferredtarget"] = res;
- if (x->game.guioptions != 0)
- dg["guioptions"] = Common::getGameGUIOptionsDescription(x->game.guioptions);
+ dg.setGUIOptions(x->game.guioptions);
detectedGames.push_back(dg);
}