- Reverted r31454 changes to detection.cpp

- Added ADGF_CD to all CD versions
- Added ADGF_DROPLANGUAGE to Kyra2/3 CD version
- Changed Kyrandia engine to use agumented target ids

svn-id: r31476

1 files changed, 52 insertions, 11 deletions

diff --git a/engines/kyra/detection.cpp b/engines/kyra/detection.cpp
index b814d75924..951b30a7da 100644
--- a/engines/kyra/detection.cpp
+++ b/engines/kyra/detection.cpp
@@ -245,7 +245,7 @@ const KYRAGameDescription adGameDescs[] = {
 			AD_ENTRY1("GEMCUT.PAK", "fac399fe62f98671e56a005c5e94e39f"),
 			Common::EN_ANY,
 			Common::kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			Common::ADGF_CD
 		},
 		KYRA1_CD_FLAGS
 	},
@@ -256,7 +256,7 @@ const KYRAGameDescription adGameDescs[] = {
 			AD_ENTRY1("GEMCUT.PAK", "230f54e6afc007ab4117159181a1c722"),
 			Common::DE_DEU,
 			Common::kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			Common::ADGF_CD
 		},
 		KYRA1_CD_FLAGS
 	},
@@ -267,7 +267,7 @@ const KYRAGameDescription adGameDescs[] = {
 			AD_ENTRY1("GEMCUT.PAK", "b037c41768b652a040360ffa3556fd2a"),
 			Common::FR_FRA,
 			Common::kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			Common::ADGF_CD
 		},
 		KYRA1_CD_FLAGS
 	},
@@ -301,9 +301,31 @@ const KYRAGameDescription adGameDescs[] = {
 			"kyra2",
 			"CD",
 			AD_ENTRY1("FATE.PAK", "28cbad1c5bf06b2d3825ae57d760d032"),
-			Common::UNK_LANG,
+			Common::EN_ANY,
 			Common::kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			Common::ADGF_DROPLANGUAGE | Common::ADGF_CD
+		},
+		KYRA2_CD_FLAGS
+	},
+	{
+		{
+			"kyra2",
+			"CD",
+			AD_ENTRY1("FATE.PAK", "28cbad1c5bf06b2d3825ae57d760d032"),
+			Common::DE_DEU,
+			Common::kPlatformPC,
+			Common::ADGF_DROPLANGUAGE | Common::ADGF_CD
+		},
+		KYRA2_CD_FLAGS
+	},
+	{
+		{
+			"kyra2",
+			"CD",
+			AD_ENTRY1("FATE.PAK", "28cbad1c5bf06b2d3825ae57d760d032"),
+			Common::FR_FRA,
+			Common::kPlatformPC,
+			Common::ADGF_DROPLANGUAGE | Common::ADGF_CD
 		},
 		KYRA2_CD_FLAGS
 	},
@@ -360,9 +382,31 @@ const KYRAGameDescription adGameDescs[] = {
 			"kyra3",
 			0,
 			AD_ENTRY1("ONETIME.PAK", "3833ff312757b8e6147f464cca0a6587"),
-			Common::UNK_LANG,
+			Common::EN_ANY,
 			Common::kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			Common::ADGF_DROPLANGUAGE
+		},
+		KYRA3_CD_FLAGS
+	},
+	{
+		{
+			"kyra3",
+			0,
+			AD_ENTRY1("ONETIME.PAK", "3833ff312757b8e6147f464cca0a6587"),
+			Common::DE_DEU,
+			Common::kPlatformPC,
+			Common::ADGF_DROPLANGUAGE
+		},
+		KYRA3_CD_FLAGS
+	},
+	{
+		{
+			"kyra3",
+			0,
+			AD_ENTRY1("ONETIME.PAK", "3833ff312757b8e6147f464cca0a6587"),
+			Common::FR_FRA,
+			Common::kPlatformPC,
+			Common::ADGF_DROPLANGUAGE
 		},
 		KYRA3_CD_FLAGS
 	},
@@ -393,7 +437,7 @@ const Common::ADParams detectionParams = {
 	// List of files for file-based fallback detection (optional)
 	0,
 	// Flags
-	Common::kADFlagDontAugmentPreferredTarget
+	0
 };
 
 } // End of anonymous namespace
@@ -436,9 +480,6 @@ bool KyraMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common
 			flags.lang = Common::EN_ANY;
 	}
 
-	if (flags.lang == Common::EN_USA || flags.lang == Common::EN_GRB)
-		flags.lang = Common::EN_ANY;
-
 	switch (flags.gameID) {
 	case Kyra::GI_KYRA1:
 		*engine = new Kyra::KyraEngine_v1(syst, flags);