From 1bd6f6c99fbc3328e2405efe3fdec0dec1bf24e4 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sat, 6 Jun 2009 17:56:41 +0000
Subject: Added game GUI options to advancedDetector and updated all engines

svn-id: r41272
---
 engines/advancedDetector.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'engines/advancedDetector.cpp')

diff --git a/engines/advancedDetector.cpp b/engines/advancedDetector.cpp
index 8b752cac85..b6440da11a 100644
--- a/engines/advancedDetector.cpp
+++ b/engines/advancedDetector.cpp
@@ -197,6 +197,9 @@ static void updateGameDescriptor(GameDescriptor &desc, const ADGameDescription *
 
 	if (params.flags & kADFlagUseExtraAsHint)
 		desc["extra"] = realDesc->extra;
+
+	if (realDesc->guioptions)
+		desc["guioptions"] = Common::getGameGUIOptionsDescription(realDesc->guioptions | params.guioptions);
 }
 
 GameList AdvancedMetaEngine::detectGames(const Common::FSList &fslist) const {
-- 
cgit v1.2.3


From 8eb417e15e978729b6724a9e9da38b9d6897e5de Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sat, 6 Jun 2009 17:56:59 +0000
Subject: Fix bug with GUI options not set when per-game setting is empty

svn-id: r41273
---
 engines/advancedDetector.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/advancedDetector.cpp')

diff --git a/engines/advancedDetector.cpp b/engines/advancedDetector.cpp
index b6440da11a..b3ce525ff2 100644
--- a/engines/advancedDetector.cpp
+++ b/engines/advancedDetector.cpp
@@ -198,7 +198,7 @@ static void updateGameDescriptor(GameDescriptor &desc, const ADGameDescription *
 	if (params.flags & kADFlagUseExtraAsHint)
 		desc["extra"] = realDesc->extra;
 
-	if (realDesc->guioptions)
+	if ((realDesc->guioptions | params.guioptions) != 0)
 		desc["guioptions"] = Common::getGameGUIOptionsDescription(realDesc->guioptions | params.guioptions);
 }
 
-- 
cgit v1.2.3


From 24a512cab08a12eb2b8f3b759d7f3d82c6853a21 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sat, 6 Jun 2009 19:47:55 +0000
Subject: Use GameDescriptor::setGUIOptions instead of setting key "guioptions"
 directly.

svn-id: r41297
---
 engines/advancedDetector.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'engines/advancedDetector.cpp')

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 {
-- 
cgit v1.2.3