Replaced the SCI_VERSION_FTU_DOSOUND_VARIANT_2 version check with the game feature flag GF_SCI1_NEWDOSOUND

svn-id: r40561

6 files changed, 42 insertions, 90 deletions

diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp
index f6b467937f..59d57b4d8b 100644
--- a/engines/sci/detection.cpp
+++ b/engines/sci/detection.cpp
@@ -38,6 +38,7 @@ namespace Sci {
 
 // SCI1
 #define GF_FOR_SCI1_200_OR_LATER GF_SCI1_LOFSABSOLUTE
+#define GF_FOR_SCI1_510_OR_LATER (GF_SCI1_LOFSABSOLUTE | GF_SCI1_NEWDOSOUND)
 
 // Titles of the games
 static const PlainGameDescriptor SciGameTitles[] = {
@@ -142,7 +143,7 @@ static const struct SciGameDescription SciGameDescriptions[] = {
 		{"resource.002", 0, "d226d7d3b4f77c4a566913fc310487fc", 792380},
 		{"resource.003", 0, "d226d7d3b4f77c4a566913fc310487fc", 464348},
 		{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0},
-		GF_FOR_SCI1_200_OR_LATER,
+		GF_FOR_SCI1_510_OR_LATER,
 		SCI_VERSION_AUTODETECT,
 		SCI_VERSION(1, 000, 510)
 	},
@@ -156,7 +157,7 @@ static const struct SciGameDescription SciGameDescriptions[] = {
 		{"resource.002", 0, "85e51acb5f9c539d66e3c8fe40e17da5", 826309},
 		{"resource.003", 0, "85e51acb5f9c539d66e3c8fe40e17da5", 493638},
 		{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformAmiga, 0},
-		GF_FOR_SCI1_200_OR_LATER,
+		GF_FOR_SCI1_510_OR_LATER,
 		SCI_VERSION_AUTODETECT,
 		SCI_VERSION(1, 000, 510)
 	},
@@ -180,7 +181,7 @@ static const struct SciGameDescription SciGameDescriptions[] = {
 		{"resource.001", 0, "d2f5a1be74ed963fa849a76892be5290", 794832},
 		{"resource.002", 0, "c0c29c51af66d65cb53f49e785a2d978", 1280907},
 		{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0},
-		GF_FOR_SCI1_200_OR_LATER,
+		GF_FOR_SCI1_510_OR_LATER,
 		SCI_VERSION_AUTODETECT,
 		SCI_VERSION(1, 0, 510)
 	},
@@ -192,7 +193,7 @@ static const struct SciGameDescription SciGameDescriptions[] = {
 		{"resource.000", 0, "27ec5fa09cd12a7fd16e86d96a2ed245", 1197694},
 		{"resource.001", 0, "735be4e58957180cfc807d5e18fdffcd", 1433302},
 		{NULL, 0, NULL, 0}}, Common::ES_ESP, Common::kPlatformPC, 0},
-		GF_FOR_SCI1_200_OR_LATER,
+		GF_FOR_SCI1_510_OR_LATER,
 		SCI_VERSION_AUTODETECT,
 		SCI_VERSION(1, 000, 510)
 	},
@@ -352,7 +353,7 @@ static const struct SciGameDescription SciGameDescriptions[] = {
 		{"resource.005", 0, "1c3804e56b114028c5873a35c2f06d13", 653002},
 		{"resource.006", 0, "f9487732289a4f4966b4e34eea413325", 842817},
 		{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0},
-		GF_FOR_SCI1_200_OR_LATER,
+		GF_FOR_SCI1_510_OR_LATER,
 		SCI_VERSION_AUTODETECT,
 		SCI_VERSION(1, 000, 510)
 	},
@@ -368,7 +369,7 @@ static const struct SciGameDescription SciGameDescriptions[] = {
 	      {"resource.005", 0, "d036df0872f2db19bca34601276be2d7", 1154950},
 	      {"resource.006", 0, "b367a6a59f29ee30dde1d88a5a41152d", 1042966},
 	      {NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0},
-	      GF_FOR_SCI1_200_OR_LATER,
+	      GF_FOR_SCI1_510_OR_LATER,
 	      SCI_VERSION_AUTODETECT,
 	      SCI_VERSION(1, 000, 510)
 	},
@@ -384,7 +385,7 @@ static const struct SciGameDescription SciGameDescriptions[] = {
 		{"resource.004", 0, "9cfce07e204a329e94fda8b5657621da", 1261462},
 		{"resource.005", 0, "21ebe6b39b57a73fc449f67f013765aa", 1284720},
 		{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0},
-		GF_FOR_SCI1_200_OR_LATER,
+		GF_FOR_SCI1_510_OR_LATER,
 		SCI_VERSION_AUTODETECT,
 		SCI_VERSION(1, 000, 510)
 	},
@@ -399,7 +400,7 @@ static const struct SciGameDescription SciGameDescriptions[] = {
 		{"resource.004", 0, "9cfce07e204a329e94fda8b5657621da", 1260237},
 		{"resource.005", 0, "21ebe6b39b57a73fc449f67f013765aa", 1284609},
 		{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0},
-		GF_FOR_SCI1_200_OR_LATER,
+		GF_FOR_SCI1_510_OR_LATER,
 		SCI_VERSION_AUTODETECT,
 		SCI_VERSION(1, 000, 510)
 	},
@@ -425,7 +426,7 @@ static const struct SciGameDescription SciGameDescriptions[] = {
 		{"resource.005", 0, "d036df0872f2db19bca34601276be2d7", 1176914},
 		{"resource.006", 0, "b367a6a59f29ee30dde1d88a5a41152d", 1123585},
 		{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformPC, 0},
-		GF_FOR_SCI1_200_OR_LATER,
+		GF_FOR_SCI1_510_OR_LATER,
 		SCI_VERSION_AUTODETECT,
 		SCI_VERSION(1, 000, 510)
 	},
@@ -459,7 +460,7 @@ static const struct SciGameDescription SciGameDescriptions[] = {
 		{"resource.002", 0, "28fe9b4f0567e71feb198bc9f3a2c605", 1241816},
 		{"resource.003", 0, "f3146df0ad4297f5ce35aa8c4753bf6c", 586832},
 		{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0},
-		GF_FOR_SCI1_200_OR_LATER | GF_SCI1_NEWSETCURSOR,
+		GF_FOR_SCI1_510_OR_LATER | GF_SCI1_NEWSETCURSOR,
 		SCI_VERSION_AUTODETECT,
 		SCI_VERSION(1, 0, 510)
 	},
@@ -472,7 +473,7 @@ static const struct SciGameDescription SciGameDescriptions[] = {
 		{"resource.002", 0, "323b3b12f43d53f27d259beb225f0aa7", 1129316},
 		{"resource.003", 0, "83ac03e4bddb2c1ac2d36d2a587d0536", 1145616},
 		{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0},
-		GF_FOR_SCI1_200_OR_LATER | GF_SCI1_NEWSETCURSOR,
+		GF_FOR_SCI1_510_OR_LATER | GF_SCI1_NEWSETCURSOR,
 		SCI_VERSION_AUTODETECT,
 		SCI_VERSION(1, 0, 510)
 	},
@@ -485,7 +486,7 @@ static const struct SciGameDescription SciGameDescriptions[] = {
 		{"resource.002", 0, "02d7d0411f7903aacb3bc8b0f8ca8a9a", 1202581},
 		{"resource.003", 0, "84dd11b6825255671c703aee5ceff620", 1175835},
 		{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformPC, 0},
-		GF_FOR_SCI1_200_OR_LATER | GF_SCI1_NEWSETCURSOR,
+		GF_FOR_SCI1_510_OR_LATER | GF_SCI1_NEWSETCURSOR,
 		SCI_VERSION_AUTODETECT,
 		SCI_VERSION(1, 0, 510)
 	},
@@ -499,7 +500,7 @@ static const struct SciGameDescription SciGameDescriptions[] = {
 		{"resource.002", 0, "2d21a1d2dcbffa551552e3e0725d2284", 1186033},
 		{"resource.003", 0, "84dd11b6825255671c703aee5ceff620", 1174993},
 		{NULL, 0, NULL, 0}}, Common::ES_ESP, Common::kPlatformPC, 0},
-		GF_FOR_SCI1_200_OR_LATER | GF_SCI1_NEWSETCURSOR,
+		GF_FOR_SCI1_510_OR_LATER | GF_SCI1_NEWSETCURSOR,
 		SCI_VERSION_AUTODETECT,
 		SCI_VERSION(1, 0, 510)
 	},
@@ -775,7 +776,7 @@ static const struct SciGameDescription SciGameDescriptions[] = {
 		{"resource.000", 0, "595b6039ea1356e7f96a52c58eedcf22", 355791},
 		{"resource.001", 0, "143df8aef214a2db34c2d48190742012", 632273},
 		{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0},
-		GF_FOR_SCI1_200_OR_LATER,
+		GF_FOR_SCI1_510_OR_LATER,
 		SCI_VERSION_AUTODETECT,
 		SCI_VERSION(1, 000, 510)
 	},
@@ -788,7 +789,7 @@ static const struct SciGameDescription SciGameDescriptions[] = {
 		{"resource.000", 0, "6ef28cac094dcd97fdb461662ead6f92", 541845},
 		{"resource.001", 0, "0a98a268ee99b92c233a0d7187c1f0fa", 845795},
 		{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0},
-		GF_FOR_SCI1_200_OR_LATER,
+		GF_FOR_SCI1_510_OR_LATER,
 		SCI_VERSION_AUTODETECT,
 		SCI_VERSION(1, 000, 510)  // this is just a guess
 	},
@@ -965,7 +966,7 @@ static const struct SciGameDescription SciGameDescriptions[] = {
 		{"resource.000", 0, "449471bfd77be52f18a3773c7f7d843d", 571368},
 		{"resource.001", 0, "b45a581ff8751e052c7e364f58d3617f", 16800210},
 		{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0},
-		GF_FOR_SCI1_200_OR_LATER | GF_SCI1_NEWSETCURSOR,
+		GF_FOR_SCI1_510_OR_LATER | GF_SCI1_NEWSETCURSOR,
 		SCI_VERSION_AUTODETECT,
 		SCI_VERSION(1, 000, 784)
 	},
@@ -1307,7 +1308,7 @@ static const struct SciGameDescription SciGameDescriptions[] = {
 		{"resource.002", 0, "5790ac0505f7ca98d4567132b875eb1e", 681041},
 		{"resource.003", 0, "4a34c3367c2fe7eb380d741374da1989", 572251},
 		{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0},
-		GF_FOR_SCI1_200_OR_LATER,
+		GF_FOR_SCI1_510_OR_LATER,
 		SCI_VERSION_AUTODETECT,
 		SCI_VERSION(1, 000, 784)
 	},
@@ -1320,7 +1321,7 @@ static const struct SciGameDescription SciGameDescriptions[] = {
 		{"resource.001", 0, "ec20246209d7b19f38989261e5c8f5b8", 1111226},
 		{"resource.002", 0, "85d6935ef77e6b0e16bc307640a0d913", 1088312},
 		{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0},
-		GF_FOR_SCI1_200_OR_LATER,
+		GF_FOR_SCI1_510_OR_LATER,
 		SCI_VERSION_AUTODETECT,
 		SCI_VERSION(1, 000, 577)
 	},
@@ -1332,7 +1333,7 @@ static const struct SciGameDescription SciGameDescriptions[] = {
 		{"resource.001", 0, "d34cadb11e1aefbb497cf91bc1d3baa7", 1114688},
 		{"resource.002", 0, "85b030bb66d5342b0a068f1208c431a8", 1078443},
 		{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0},
-		GF_FOR_SCI1_200_OR_LATER,
+		GF_FOR_SCI1_510_OR_LATER,
 		SCI_VERSION_AUTODETECT,
 		SCI_VERSION(1, 000, 510)
 	},
@@ -1357,7 +1358,7 @@ static const struct SciGameDescription SciGameDescriptions[] = {
 		{"resource.002", 0, "3fe2a3aec0ed53c7d6db1845a67e3aa2", 1095908},
 		{"resource.003", 0, "ac175df0ea9a2cba57f0248651856d27", 376556},
 		{NULL, 0, NULL, 0}}, Common::ES_ESP, Common::kPlatformPC, 0},
-		GF_FOR_SCI1_200_OR_LATER,
+		GF_FOR_SCI1_510_OR_LATER,
 		SCI_VERSION_AUTODETECT,
 		SCI_VERSION(1, 000, 510)
 	},
@@ -1514,7 +1515,7 @@ static const struct SciGameDescription SciGameDescriptions[] = {
 		{"resource.005", 0, "f8b2d1137bb767e5d232056b99dd69eb", 623621},
 		{"resource.006", 0, "bafc64e3144f115dc58c6aee02de98fb", 715598},
 		{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0},
-		GF_FOR_SCI1_200_OR_LATER,
+		GF_FOR_SCI1_510_OR_LATER,
 		SCI_VERSION_AUTODETECT,
 		SCI_VERSION(1, 000, 784)
 	},
@@ -1532,7 +1533,7 @@ static const struct SciGameDescription SciGameDescriptions[] = {
 		{"resource.006", 0, "bafc64e3144f115dc58c6aee02de98fb", 754966},
 		{"resource.007", 0, "59eba83ad465b08d763b44f86afa86f6", 683135},
 		{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformAmiga, 0},
-		GF_FOR_SCI1_200_OR_LATER,
+		GF_FOR_SCI1_510_OR_LATER,
 		SCI_VERSION_AUTODETECT,
 		SCI_VERSION(1, 000, 784)
 	},
@@ -1559,7 +1560,7 @@ static const struct SciGameDescription SciGameDescriptions[] = {
 		{"resource.006", 0, "dda27ce00682aa76198dac124bbbe334", 1024810},
 		{"resource.007", 0, "ac443fae1285fb359bf2b2bc6a7301ae", 1030656},
 		{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0},
-		GF_FOR_SCI1_200_OR_LATER,
+		GF_FOR_SCI1_510_OR_LATER,
 		SCI_VERSION_AUTODETECT,
 		SCI_VERSION(1, 000, 510)
 	},
@@ -1576,7 +1577,7 @@ static const struct SciGameDescription SciGameDescriptions[] = {
 		{"resource.006", 0, "dda27ce00682aa76198dac124bbbe334", 1021774},
 		{"resource.007", 0, "ac443fae1285fb359bf2b2bc6a7301ae", 993408},
 		{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformPC, 0},
-		GF_FOR_SCI1_200_OR_LATER,
+		GF_FOR_SCI1_510_OR_LATER,
 		SCI_VERSION_AUTODETECT,
 		SCI_VERSION(1, 000, 510)	// placed the English version here
 	},
@@ -1594,7 +1595,7 @@ static const struct SciGameDescription SciGameDescriptions[] = {
 		{"resource.006", 0, "dda27ce00682aa76198dac124bbbe334", 946540},
 		{"resource.007", 0, "ac443fae1285fb359bf2b2bc6a7301ae", 958842},
 		{NULL, 0, NULL, 0}}, Common::FR_FRA, Common::kPlatformPC, 0},
-		GF_FOR_SCI1_200_OR_LATER,
+		GF_FOR_SCI1_510_OR_LATER,
 		SCI_VERSION_AUTODETECT,
 		SCI_VERSION(1, 000, 510)
 	},
@@ -1612,7 +1613,7 @@ static const struct SciGameDescription SciGameDescriptions[] = {
 		{"resource.006", 0, "dda27ce00682aa76198dac124bbbe334", 1015136},
 		{"resource.007", 0, "ac443fae1285fb359bf2b2bc6a7301ae", 987222},
 		{NULL, 0, NULL, 0}}, Common::ES_ESP, Common::kPlatformPC, 0},
-		GF_FOR_SCI1_200_OR_LATER,
+		GF_FOR_SCI1_510_OR_LATER,
 		SCI_VERSION_AUTODETECT,
 		SCI_VERSION(1, 000, 510)
 	},
@@ -1623,7 +1624,7 @@ static const struct SciGameDescription SciGameDescriptions[] = {
 		{"resource.map", 0, "a99776df795127f387cb35dae872d4e4", 5919},
 		{"resource.000", 0, "a8989a5a89e7d4f702b26b378c7a357a", 7001981},
 		{NULL, 0, NULL, 0}}, Common::IT_ITA, Common::kPlatformPC, 0},
-		GF_FOR_SCI1_200_OR_LATER,
+		GF_FOR_SCI1_510_OR_LATER,
 		SCI_VERSION_AUTODETECT,
 		SCI_VERSION(1, 000, 510)
 	},
@@ -1910,7 +1911,7 @@ static const struct SciGameDescription SciGameDescriptions[] = {
 		{"resource.map", 0, "5b457cbe5042f557e5b610148171f6c0", 1158},
 		{"resource.001", 0, "453ea81ef66a50cbe33ce06302afe47f", 229737},
 		{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0},
-		GF_FOR_SCI1_200_OR_LATER,
+		GF_FOR_SCI1_510_OR_LATER,
 		SCI_VERSION_AUTODETECT,
 		SCI_VERSION(1, 000, 679)
 	},
@@ -2033,7 +2034,7 @@ static const struct SciGameDescription SciGameDescriptions[] = {
 		{"resource.003", 0, "630bfa65beb05f743552704ac2899dae", 759891},
 		{"resource.004", 0, "7b229fbdf30d670d0728cede3e984a7e", 838663},
 		{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0},
-		GF_FOR_SCI1_200_OR_LATER,
+		GF_FOR_SCI1_510_OR_LATER,
 		SCI_VERSION_AUTODETECT,
 		SCI_VERSION(1, 000, 784)
 	},
@@ -2049,7 +2050,7 @@ static const struct SciGameDescription SciGameDescriptions[] = {
 		{"resource.004", 0, "6258d5dd85898d8e218eb8113ebc9059", 722738},
 		{"resource.005", 0, "6258d5dd85898d8e218eb8113ebc9059", 704485},
 		{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformAmiga, 0},
-		GF_FOR_SCI1_200_OR_LATER,
+		GF_FOR_SCI1_510_OR_LATER,
 		SCI_VERSION_AUTODETECT,
 		SCI_VERSION(1, 000, 784)
 	},
@@ -2064,7 +2065,7 @@ static const struct SciGameDescription SciGameDescriptions[] = {
 		{"resource.003", 0, "8791b9eef53edf77c2dac950142221d3", 1159791},
 		{"resource.004", 0, "1b91e891a3c60a941dac0eecdf83375b", 1143606},
 		{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0},
-		GF_FOR_SCI1_200_OR_LATER,
+		GF_FOR_SCI1_510_OR_LATER,
 		SCI_VERSION_AUTODETECT,
 		SCI_VERSION(1, 000, 510)
 	},
@@ -2076,7 +2077,7 @@ static const struct SciGameDescription SciGameDescriptions[] = {
 		{"resource.000", 0, "277f97771f7a6d89677141f02da313d6", 65150},
 		{"resource.001", 0, "5c5a551b6c86cce2ee75becb90e0b586", 624411},
 		{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO},
-		GF_FOR_SCI1_200_OR_LATER,
+		GF_FOR_SCI1_510_OR_LATER,
 		SCI_VERSION_AUTODETECT,
 		SCI_VERSION(1, 0, 510)
 	},
@@ -2091,7 +2092,7 @@ static const struct SciGameDescription SciGameDescriptions[] = {
 		{"resource.003", 0, "4836f460f4cfc8de61e2df4c45775504", 1180956},
 		{"resource.004", 0, "0c3eb84b9755852d9e795e0d5c9373c7", 1171760},
 		{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformPC, 0},
-		GF_FOR_SCI1_200_OR_LATER,
+		GF_FOR_SCI1_510_OR_LATER,
 		SCI_VERSION_AUTODETECT,
 		SCI_VERSION(1, 000, 510)
 	},
@@ -2482,7 +2483,7 @@ static const struct SciGameDescription SciGameDescriptions[] = {
 		{"resource.004", 0, "b25a1539c71701f7715f738c5037e9a6", 775515},
 		{"resource.005", 0, "640ffe1a9acde392cc33cc1b1a528328", 806324},
 		{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0},
-		GF_FOR_SCI1_200_OR_LATER,
+		GF_FOR_SCI1_510_OR_LATER,
 		SCI_VERSION_AUTODETECT,
 		SCI_VERSION(1, 000, 510) // TODO: best bet, exe seems packed
 	},
@@ -2497,7 +2498,7 @@ static const struct SciGameDescription SciGameDescriptions[] = {
 		{"resource.003", 0, "c47600e50c6fc591957ae0c5020ee7b8", 1213262},
 		{"resource.004", 0, "e19ea4ad131472f9238590f2e1d40289", 1203051},
 		{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0},
-		GF_FOR_SCI1_200_OR_LATER,
+		GF_FOR_SCI1_510_OR_LATER,
 		SCI_VERSION_AUTODETECT,
 		SCI_VERSION(1, 000, 510)
 	},
@@ -2523,7 +2524,7 @@ static const struct SciGameDescription SciGameDescriptions[] = {
 		{"resource.004", 0, "9b78228ad4f9f335fedf74f1812dcfca", 513325},
 		{"resource.005", 0, "7d4ebcb745c0bf8fc42e4013f52ecd49", 1101812},
 		{NULL, 0, NULL, 0}}, Common::ES_ESP, Common::kPlatformPC, 0},
-		GF_FOR_SCI1_200_OR_LATER,
+		GF_FOR_SCI1_510_OR_LATER,
 		SCI_VERSION_AUTODETECT,
 		SCI_VERSION(1, 000, 510)
 	},
@@ -2551,7 +2552,7 @@ static const struct SciGameDescription SciGameDescriptions[] = {
 		{"resource.004", 0, "6d8f34090503ce937e7dbef6cb6cdb6a", 545053},
 		{"resource.005", 0, "6d8f34090503ce937e7dbef6cb6cdb6a", 687507},
 		{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformAmiga, 0},
-		GF_FOR_SCI1_200_OR_LATER,
+		GF_FOR_SCI1_510_OR_LATER,
 		SCI_VERSION_AUTODETECT,
 		SCI_VERSION(1, 000, 784)
 	},
@@ -2634,7 +2635,7 @@ static const struct SciGameDescription SciGameDescriptions[] = {
 		{"resource.005", 0, "3540d1cc84d674cf4b2c898b88a3b563", 790296},
 		{"resource.006", 0, "ade814bc4d56244c156d9e9bcfebbc11", 664085},
 		{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0},
-		GF_FOR_SCI1_200_OR_LATER,
+		GF_FOR_SCI1_510_OR_LATER,
 		SCI_VERSION_AUTODETECT,
 		SCI_VERSION(1, 000, 784)
 	},
@@ -2650,7 +2651,7 @@ static const struct SciGameDescription SciGameDescriptions[] = {
 		{"resource.005", 0, "10ee1709e6559c724676d058199b75b5", 818745},
 		{"resource.006", 0, "67fb188b191d88efe8414af6ea297b93", 672675},
 		{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformAmiga, 0},
-		GF_FOR_SCI1_200_OR_LATER,
+		GF_FOR_SCI1_510_OR_LATER,
 		SCI_VERSION_AUTODETECT,
 		SCI_VERSION(1, 000, 744) // TODO: best bet, exe seems packed
 	},
diff --git a/engines/sci/engine/game.cpp b/engines/sci/engine/game.cpp
index ed7564e0b7..985f9745c7 100644
--- a/engines/sci/engine/game.cpp
+++ b/engines/sci/engine/game.cpp
@@ -34,7 +34,6 @@
 #include "sci/gfx/gfx_widgets.h"
 #include "sci/gfx/gfx_state_internal.h"	// required for GfxPort, GfxVisual
 #include "sci/gfx/menubar.h"
-#include "sci/scicore/versions.h"
 
 namespace Sci {
 
diff --git a/engines/sci/engine/ksound.cpp b/engines/sci/engine/ksound.cpp
index 421816fbcd..2213a8e869 100644
--- a/engines/sci/engine/ksound.cpp
+++ b/engines/sci/engine/ksound.cpp
@@ -28,7 +28,6 @@
 #include "sci/sfx/player.h"
 #include "sci/engine/kernel.h"
 #include "sci/engine/vm.h"		// for Object
-#include "sci/scicore/versions.h"
 
 namespace Sci {
 
@@ -984,7 +983,7 @@ reg_t kDoSound_SCI1(EngineState *s, int funct_nr, int argc, reg_t *argv) {
 }
 
 reg_t kDoSound(EngineState *s, int funct_nr, int argc, reg_t *argv) {
-	if (s->version >= SCI_VERSION_FTU_DOSOUND_VARIANT_2)
+	if (s->flags & GF_SCI1_NEWDOSOUND)
 		return kDoSound_SCI1(s, funct_nr, argc, argv);
 	else if (s->version >= SCI_VERSION(1,000,000))
 		return kDoSound_SCI01(s, funct_nr, argc, argv);
diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp
index 83e1f0a448..8eddfd7d9e 100644
--- a/engines/sci/engine/vm.cpp
+++ b/engines/sci/engine/vm.cpp
@@ -29,7 +29,6 @@
 #include "sci/sci.h"
 #include "sci/scicore/resource.h"
 #include "sci/engine/state.h"
-#include "sci/scicore/versions.h"
 #include "sci/engine/intmap.h"
 #include "sci/engine/kdebug.h"
 #include "sci/engine/kernel.h"
diff --git a/engines/sci/sci.h b/engines/sci/sci.h
index b682ffaf48..a70ab8a8e3 100644
--- a/engines/sci/sci.h
+++ b/engines/sci/sci.h
@@ -127,7 +127,7 @@ enum SciGameFlags {
 	/* Applies to all versions from 1.000.510 onwards
 	** kDoSound() is different than in earlier SCI1 versions.
 	*/
-	GF_NEWDOSOUND			= (1 << 4),
+	GF_SCI1_NEWDOSOUND		= (1 << 4),
 
 	/*
 	** Newer SCI1 games (like KQ5 CD and EcoQuest 1) use
diff --git a/engines/sci/scicore/versions.h b/engines/sci/scicore/versions.h
deleted file mode 100644
index 0c2b131d10..0000000000
--- a/engines/sci/scicore/versions.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-/* Versions management */
-
-#ifndef SCI_SCICORE_VERSIONS_H
-#define SCI_SCICORE_VERSIONS_H
-
-namespace Sci {
-
-/* Version number guide:
-** - Always use the version number of the first known version to have a special feature.
-** - Don't assume that special feature changes are linked just because they appeared to change
-**   simultaneously.
-** - Put all the magic version numbers here, into THIS file.
-** - "FTU" means "First To Use"
-*/
-
-#define SCI_VERSION_FTU_DOSOUND_VARIANT_2 SCI_VERSION(1,000,510)
-
-
-} // End of namespace Sci
-
-#endif // SCI_SCICORE_VERSIONS_H