From 0186bda0cecccffda9063b8b04ca663fa2ea7cf4 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 16 Oct 2011 15:59:21 +0300
Subject: SCI: Updated the description of LSL6 hires to distinguish it better

---
 engines/sci/detection.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/sci/detection.cpp')

diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp
index 56da696592..88a9fdbc75 100644
--- a/engines/sci/detection.cpp
+++ b/engines/sci/detection.cpp
@@ -106,7 +106,7 @@ static const PlainGameDescriptor s_sciGameTitles[] = {
 	// TODO: Inside The Chest/Behind the Developer's Shield
 	{"kq7",             "King's Quest VII: The Princeless Bride"},
 	// TODO: King's Questions
-	{"lsl6hires",       "Leisure Suit Larry 6: Shape Up or Slip Out!"},
+	{"lsl6hires",       "Leisure Suit Larry 6: Shape Up or Slip Out! Hires version"},
 	{"mothergoosehires","Mixed-Up Mother Goose Deluxe"},
 	{"phantasmagoria",  "Phantasmagoria"},
 	{"pqswat",          "Police Quest: SWAT"},
-- 
cgit v1.2.3


From e49c65a27b994869327fb2b5f0654d9acb5cdb90 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 16 Oct 2011 16:50:09 +0300
Subject: SCI: Moved the Hi-res description for LSL6 hi-res in the extras field

---
 engines/sci/detection.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/sci/detection.cpp')

diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp
index 88a9fdbc75..56da696592 100644
--- a/engines/sci/detection.cpp
+++ b/engines/sci/detection.cpp
@@ -106,7 +106,7 @@ static const PlainGameDescriptor s_sciGameTitles[] = {
 	// TODO: Inside The Chest/Behind the Developer's Shield
 	{"kq7",             "King's Quest VII: The Princeless Bride"},
 	// TODO: King's Questions
-	{"lsl6hires",       "Leisure Suit Larry 6: Shape Up or Slip Out! Hires version"},
+	{"lsl6hires",       "Leisure Suit Larry 6: Shape Up or Slip Out!"},
 	{"mothergoosehires","Mixed-Up Mother Goose Deluxe"},
 	{"phantasmagoria",  "Phantasmagoria"},
 	{"pqswat",          "Police Quest: SWAT"},
-- 
cgit v1.2.3


From 32972a5ffb180c9e8a6a9eae51d0e7564ce76d9e Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sun, 23 Oct 2011 17:52:43 +0100
Subject: AD: Switched rest of the engines to new GUIO

---
 engines/sci/detection.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'engines/sci/detection.cpp')

diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp
index 56da696592..2d567a7fde 100644
--- a/engines/sci/detection.cpp
+++ b/engines/sci/detection.cpp
@@ -373,7 +373,7 @@ static ADGameDescription s_fallbackDesc = {
 	Common::UNK_LANG,
 	Common::kPlatformPC,
 	ADGF_NO_FLAGS,
-	Common::GUIO_NONE
+	GUIO1(GUIO_NONE)
 };
 
 static char s_fallbackGameIdBuf[256];
@@ -435,7 +435,7 @@ const ADGameDescription *SciMetaEngine::fallbackDetect(const FileMap &allFiles,
 	s_fallbackDesc.flags = ADGF_NO_FLAGS;
 	s_fallbackDesc.platform = Common::kPlatformPC;	// default to PC platform
 	s_fallbackDesc.gameid = "sci";
-	s_fallbackDesc.guioptions = Common::GUIO_NONE;
+	s_fallbackDesc.guioptions = GUIO1(GUIO_NONE);
 
 	if (allFiles.contains("resource.map") || allFiles.contains("Data1")
 	    || allFiles.contains("resmap.001") || allFiles.contains("resmap.001")) {
@@ -565,7 +565,7 @@ const ADGameDescription *SciMetaEngine::fallbackDetect(const FileMap &allFiles,
 	const bool isCD = (s_fallbackDesc.flags & ADGF_CD);
 
 	if (!isCD)
-		s_fallbackDesc.guioptions |= Common::GUIO_NOSPEECH;
+		s_fallbackDesc.guioptions = GUIO1(GUIO_NOSPEECH);
 
 	if (gameId.hasSuffix("sci")) {
 		s_fallbackDesc.extra = "SCI";
-- 
cgit v1.2.3


From bab4b6f7295f6fb960ebbf44b009bd6adbd0d33e Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 16 Nov 2011 22:38:58 +0100
Subject: LAUNCHER: Introduce GUIO0() in order to replace GUIO1(GUIO_NONE)

---
 engines/sci/detection.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines/sci/detection.cpp')

diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp
index 2d567a7fde..80f45b4325 100644
--- a/engines/sci/detection.cpp
+++ b/engines/sci/detection.cpp
@@ -373,7 +373,7 @@ static ADGameDescription s_fallbackDesc = {
 	Common::UNK_LANG,
 	Common::kPlatformPC,
 	ADGF_NO_FLAGS,
-	GUIO1(GUIO_NONE)
+	GUIO0()
 };
 
 static char s_fallbackGameIdBuf[256];
@@ -435,7 +435,7 @@ const ADGameDescription *SciMetaEngine::fallbackDetect(const FileMap &allFiles,
 	s_fallbackDesc.flags = ADGF_NO_FLAGS;
 	s_fallbackDesc.platform = Common::kPlatformPC;	// default to PC platform
 	s_fallbackDesc.gameid = "sci";
-	s_fallbackDesc.guioptions = GUIO1(GUIO_NONE);
+	s_fallbackDesc.guioptions = GUIO0();
 
 	if (allFiles.contains("resource.map") || allFiles.contains("Data1")
 	    || allFiles.contains("resmap.001") || allFiles.contains("resmap.001")) {
-- 
cgit v1.2.3