Moved AdvancedDetector from common/ to engines/

svn-id: r36132

1 files changed, 167 insertions, 167 deletions

diff --git a/engines/gob/detection.cpp b/engines/gob/detection.cpp
index ba1f2f4c09..158e71c81c 100644
--- a/engines/gob/detection.cpp
+++ b/engines/gob/detection.cpp
@@ -24,14 +24,14 @@
  */
 
 #include "base/plugins.h"
-#include "common/advancedDetector.h"
+#include "engines/advancedDetector.h"
 
 #include "gob/gob.h"
 
 namespace Gob {
 
 struct GOBGameDescription {
-	Common::ADGameDescription desc;
+	ADGameDescription desc;
 
 	GameType gameType;
 	int32 features;
@@ -77,7 +77,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("intro.stk", "c65e9cc8ba23a38456242e1f2b1caad4"),
 			UNK_LANG,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob1,
 		kFeaturesEGA,
@@ -90,7 +90,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("intro.stk", "f9233283a0be2464248d83e14b95f09c"),
 			RU_RUS,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob1,
 		kFeaturesEGA,
@@ -103,7 +103,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("intro.stk", "26a9118c0770fa5ac93a9626761600b2"),
 			UNK_LANG,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob1,
 		kFeaturesNone,
@@ -116,7 +116,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "e157cb59c6d330ca70d12ab0ef1dd12b", 288972),
 			EN_GRB,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob1,
 		kFeaturesAdlib,
@@ -129,7 +129,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("intro.stk", "2fbf4b5b82bbaee87eb45d4404c28998"),
 			EN_USA,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob1,
 		kFeaturesCD,
@@ -142,7 +142,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("intro.stk", "2fbf4b5b82bbaee87eb45d4404c28998"),
 			DE_DEU,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob1,
 		kFeaturesCD,
@@ -155,7 +155,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("intro.stk", "2fbf4b5b82bbaee87eb45d4404c28998"),
 			FR_FRA,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob1,
 		kFeaturesCD,
@@ -168,7 +168,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("intro.stk", "2fbf4b5b82bbaee87eb45d4404c28998"),
 			IT_ITA,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob1,
 		kFeaturesCD,
@@ -181,7 +181,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("intro.stk", "2fbf4b5b82bbaee87eb45d4404c28998"),
 			ES_ESP,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob1,
 		kFeaturesCD,
@@ -194,7 +194,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("intro.stk", "8bd873137b6831c896ee8ad217a6a398"),
 			EN_USA,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob1,
 		kFeaturesCD,
@@ -207,7 +207,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("intro.stk", "8bd873137b6831c896ee8ad217a6a398"),
 			DE_DEU,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob1,
 		kFeaturesCD,
@@ -220,7 +220,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("intro.stk", "8bd873137b6831c896ee8ad217a6a398"),
 			FR_FRA,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob1,
 		kFeaturesCD,
@@ -233,7 +233,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("intro.stk", "8bd873137b6831c896ee8ad217a6a398"),
 			IT_ITA,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob1,
 		kFeaturesCD,
@@ -246,7 +246,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("intro.stk", "8bd873137b6831c896ee8ad217a6a398"),
 			ES_ESP,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob1,
 		kFeaturesCD,
@@ -259,7 +259,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("intro.stk", "972f22c6ff8144a6636423f0354ca549"),
 			UNK_LANG,
 			kPlatformAmiga,
-			Common::ADGF_DEMO
+			ADGF_DEMO
 		},
 		kGameTypeGob1,
 		kFeaturesNone,
@@ -272,7 +272,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("intro.stk", "e72bd1e3828c7dec4c8a3e58c48bdfdb"),
 			UNK_LANG,
 			kPlatformPC,
-			Common::ADGF_DEMO
+			ADGF_DEMO
 		},
 		kGameTypeGob1,
 		kFeaturesNone,
@@ -285,7 +285,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "a796096280d5efd48cf8e7dfbe426eb5", 193595),
 			UNK_LANG,
 			kPlatformPC,
-			Common::ADGF_DEMO
+			ADGF_DEMO
 		},
 		kGameTypeGob1,
 		kFeaturesNone,
@@ -298,7 +298,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "6d837c6380d8f4d984c9f6cc0026df4f", 192712),
 			EN_ANY,
 			kPlatformMacintosh,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob1,
 		kFeaturesNone,
@@ -311,7 +311,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("intro.stk", "00a42a7d2d22e6b6ab1b8c673c4ed267"),
 			EN_ANY,
 			kPlatformMacintosh,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob1,
 		kFeaturesAdlib,
@@ -324,7 +324,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("intro.stk", "00a42a7d2d22e6b6ab1b8c673c4ed267"),
 			DE_DEU,
 			kPlatformMacintosh,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob1,
 		kFeaturesAdlib,
@@ -337,7 +337,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("intro.stk", "00a42a7d2d22e6b6ab1b8c673c4ed267"),
 			FR_FRA,
 			kPlatformMacintosh,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob1,
 		kFeaturesAdlib,
@@ -350,7 +350,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("intro.stk", "00a42a7d2d22e6b6ab1b8c673c4ed267"),
 			IT_ITA,
 			kPlatformMacintosh,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob1,
 		kFeaturesAdlib,
@@ -363,7 +363,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("intro.stk", "00a42a7d2d22e6b6ab1b8c673c4ed267"),
 			ES_ESP,
 			kPlatformMacintosh,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob1,
 		kFeaturesAdlib,
@@ -376,7 +376,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "a13ecb4f6d8fd881ebbcc02e45cb5475", 837275),
 			FR_FRA,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob2,
 		kFeaturesAdlib,
@@ -393,7 +393,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			},
 			FR_FRA,
 			kPlatformMacintosh,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob2,
 		kFeaturesAdlib,
@@ -406,7 +406,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "5f53c56e3aa2f1e76c2e4f0caa15887f", 829232),
 			ES_ESP,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob2,
 		kFeaturesAdlib,
@@ -419,7 +419,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("intro.stk", "b45b984ee8017efd6ea965b9becd4d66"),
 			EN_GRB,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob2,
 		kFeaturesAdlib,
@@ -436,7 +436,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			},
 			UNK_LANG,
 			kPlatformMacintosh,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob2,
 		kFeaturesAdlib,
@@ -449,7 +449,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("intro.stk", "dedb5d31d8c8050a8cf77abedcc53dae"),
 			EN_USA,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob2,
 		kFeaturesAdlib,
@@ -462,7 +462,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "25a99827cd59751a80bed9620fb677a0", 893302),
 			EN_USA,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob2,
 		kFeaturesAdlib,
@@ -475,7 +475,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("intro.stk", "a13892cdf4badda85a6f6fb47603a128"),
 			DE_DEU,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob2,
 		kFeaturesAdlib,
@@ -488,7 +488,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("intro.stk", "cd3e1df8b273636ee32e34b7064f50e8"),
 			RU_RUS,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob2,
 		kFeaturesAdlib,
@@ -501,7 +501,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "eebf2810122cfd17399260cd1468e994", 554014),
 			EN_ANY,
 			kPlatformAmiga,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob2,
 		kFeaturesNone,
@@ -514,7 +514,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("intro.stk", "d28b9e9b41f31acfa58dcd12406c7b2c"),
 			DE_DEU,
 			kPlatformAmiga,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob2,
 		kFeaturesNone,
@@ -527,7 +527,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("intro.stk", "3e4e7db0d201587dd2df4003b2993ef6"),
 			DE_DEU,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob2,
 		kFeaturesAdlib,
@@ -540,7 +540,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "4b13c02d1069b86bcfec80f4e474b98b", 554680),
 			FR_FRA,
 			kPlatformAtariST,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob2,
 		kFeaturesNone,
@@ -553,7 +553,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("intro.stk", "9de5fbb41cf97182109e5fecc9d90347"),
 			EN_USA,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob2,
 		kFeaturesCD,
@@ -566,7 +566,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("intro.stk", "24a6b32757752ccb1917ce92fd7c2a04"),
 			EN_ANY,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob2,
 		kFeaturesCD,
@@ -579,7 +579,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("intro.stk", "24a6b32757752ccb1917ce92fd7c2a04"),
 			DE_DEU,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob2,
 		kFeaturesCD,
@@ -592,7 +592,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("intro.stk", "24a6b32757752ccb1917ce92fd7c2a04"),
 			FR_FRA,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob2,
 		kFeaturesCD,
@@ -605,7 +605,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("intro.stk", "24a6b32757752ccb1917ce92fd7c2a04"),
 			IT_ITA,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob2,
 		kFeaturesCD,
@@ -618,7 +618,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("intro.stk", "24a6b32757752ccb1917ce92fd7c2a04"),
 			ES_ESP,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob2,
 		kFeaturesCD,
@@ -631,7 +631,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("intro.stk", "8b1c98ff2ab2e14f47a1b891e9b92217"),
 			UNK_LANG,
 			kPlatformPC,
-			Common::ADGF_DEMO
+			ADGF_DEMO
 		},
 		kGameTypeGob2,
 		kFeaturesAdlib,
@@ -644,7 +644,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("intro.stk", "cf1c95b2939bd8ff58a25c756cb6125e"),
 			UNK_LANG,
 			kPlatformPC,
-			Common::ADGF_DEMO
+			ADGF_DEMO
 		},
 		kGameTypeGob2,
 		kFeaturesAdlib,
@@ -657,7 +657,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("intro.stk", "4b278c2678ea01383fd5ca114d947eea"),
 			UNK_LANG,
 			kPlatformAmiga,
-			Common::ADGF_DEMO
+			ADGF_DEMO
 		},
 		kGameTypeGob2,
 		kFeaturesNone,
@@ -670,7 +670,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "9fa85aea959fa8c582085855fbd99346", 553063),
 			UNK_LANG,
 			kPlatformAmiga,
-			Common::ADGF_DEMO
+			ADGF_DEMO
 		},
 		kGameTypeGob2,
 		kFeaturesNone,
@@ -683,7 +683,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("intro.stk", "2bb8878a8042244dd2b96ff682381baa"),
 			EN_GRB,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeWeen,
 		kFeaturesAdlib,
@@ -696,7 +696,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "de92e5c6a8c163007ffceebef6e67f7d", 7117568),
 			EN_USA,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeWeen,
 		kFeaturesAdlib,
@@ -709,7 +709,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "6d60f9205ecfbd8735da2ee7823a70dc", 7014426),
 			ES_ESP,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeWeen,
 		kFeaturesAdlib,
@@ -726,7 +726,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			},
 			EN_GRB,
 			kPlatformAmiga,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeWeen,
 		kFeaturesNone,
@@ -743,7 +743,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			},
 			EN_GRB,
 			kPlatformAtariST,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeWeen,
 		kFeaturesNone,
@@ -756,7 +756,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "af83debf2cbea21faa591c7b4608fe92", 458192),
 			DE_DEU,
 			kPlatformAmiga,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeWeen,
 		kFeaturesNone,
@@ -769,7 +769,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "257fe669705ac4971efdfd5656eef16a", 457719),
 			FR_FRA,
 			kPlatformAmiga,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeWeen,
 		kFeaturesNone,
@@ -782,7 +782,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "dffd1ab98fe76150d6933329ca6f4cc4", 459458),
 			FR_FRA,
 			kPlatformAmiga,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeWeen,
 		kFeaturesNone,
@@ -795,7 +795,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("intro.stk", "e6d13fb3b858cb4f78a8780d184d5b2c"),
 			FR_FRA,
 			kPlatformAtariST,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeWeen,
 		kFeaturesNone,
@@ -808,7 +808,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("intro.stk", "4b10525a3782aa7ecd9d833b5c1d308b"),
 			FR_FRA,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeWeen,
 		kFeaturesAdlib,
@@ -821,7 +821,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("intro.stk", "63170e71f04faba88673b3f510f9c4c8"),
 			DE_DEU,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeWeen,
 		kFeaturesAdlib,
@@ -834,7 +834,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "8b57cd510da8a3bbd99e3a0297a8ebd1", 7018771),
 			IT_ITA,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeWeen,
 		kFeaturesAdlib,
@@ -847,7 +847,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("intro.stk", "2e9c2898f6bf206ede801e3b2e7ee428"),
 			UNK_LANG,
 			kPlatformPC,
-			Common::ADGF_DEMO
+			ADGF_DEMO
 		},
 		kGameTypeWeen,
 		kFeaturesAdlib,
@@ -860,7 +860,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("intro.stk", "15fb91a1b9b09684b28ac75edf66e504"),
 			EN_USA,
 			kPlatformPC,
-			Common::ADGF_DEMO
+			ADGF_DEMO
 		},
 		kGameTypeWeen,
 		kFeaturesAdlib,
@@ -873,7 +873,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("intro.stk", "da3c54be18ab73fbdb32db24624a9c23"),
 			UNK_LANG,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeBargon,
 		kFeaturesNone,
@@ -886,7 +886,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "2f54b330d21f65b04b7c1f8cca76426c", 262109),
 			FR_FRA,
 			kPlatformAtariST,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeBargon,
 		kFeaturesNone,
@@ -899,7 +899,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "11103b304286c23945560b391fd37e7d", 3181890),
 			ES_ESP,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeBargon,
 		kFeaturesNone,
@@ -912,7 +912,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "da3c54be18ab73fbdb32db24624a9c23", 3181825),
 			DE_DEU,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeBargon,
 		kFeaturesNone,
@@ -925,7 +925,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "569d679fe41d49972d34c9fce5930dda", 269825),
 			EN_ANY,
 			kPlatformAmiga,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeBargon,
 		kFeaturesNone,
@@ -938,7 +938,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "00f6b4e2ee26e5c40b488e2df5adcf03", 3975580),
 			FR_FRA,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeBargon,
 		kFeaturesNone,
@@ -951,7 +951,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "da3c54be18ab73fbdb32db24624a9c23", 3181825),
 			IT_ITA,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeBargon,
 		kFeaturesNone,
@@ -964,7 +964,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "e453bea7b28a67c930764d945f64d898", 3913628),
 			EN_ANY,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob2,
 		kFeaturesAdlib,
@@ -977,7 +977,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "7b7f48490dedc8a7cb999388e2fadbe3", 3930674),
 			EN_USA,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeLostInTime,
 		kFeaturesAdlib,
@@ -990,7 +990,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "3712e7527ba8ce5637d2aadf62783005", 72318),
 			FR_FRA,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeLostInTime,
 		kFeaturesAdlib,
@@ -1003,7 +1003,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "f1f78b663893b58887add182a77df151", 3944090),
 			DE_DEU,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeLostInTime,
 		kFeaturesAdlib,
@@ -1016,7 +1016,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "cd322cb3c64ef2ba2f2134aa2122cfe9", 3936700),
 			ES_ESP,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeLostInTime,
 		kFeaturesAdlib,
@@ -1033,7 +1033,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			},
 			FR_FRA,
 			kPlatformMacintosh,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeLostInTime,
 		kFeaturesAdlib,
@@ -1046,7 +1046,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "6263d09e996c1b4e84ef2d650b820e57", 4831170),
 			EN_USA,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeLostInTime,
 		kFeaturesCD,
@@ -1059,7 +1059,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "6263d09e996c1b4e84ef2d650b820e57", 4831170),
 			FR_FRA,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeLostInTime,
 		kFeaturesCD,
@@ -1072,7 +1072,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "6263d09e996c1b4e84ef2d650b820e57", 4831170),
 			IT_ITA,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeLostInTime,
 		kFeaturesCD,
@@ -1085,7 +1085,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "6263d09e996c1b4e84ef2d650b820e57", 4831170),
 			DE_DEU,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeLostInTime,
 		kFeaturesCD,
@@ -1098,7 +1098,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "6263d09e996c1b4e84ef2d650b820e57", 4831170),
 			ES_ESP,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeLostInTime,
 		kFeaturesCD,
@@ -1111,7 +1111,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "6263d09e996c1b4e84ef2d650b820e57", 4831170),
 			EN_GRB,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeLostInTime,
 		kFeaturesCD,
@@ -1124,7 +1124,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "795be7011ec31bf5bb8ce4efdb9ee5d3", 4838904),
 			EN_USA,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeLostInTime,
 		kFeaturesCD,
@@ -1137,7 +1137,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "795be7011ec31bf5bb8ce4efdb9ee5d3", 4838904),
 			FR_FRA,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeLostInTime,
 		kFeaturesCD,
@@ -1150,7 +1150,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "795be7011ec31bf5bb8ce4efdb9ee5d3", 4838904),
 			IT_ITA,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeLostInTime,
 		kFeaturesCD,
@@ -1163,7 +1163,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "795be7011ec31bf5bb8ce4efdb9ee5d3", 4838904),
 			DE_DEU,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeLostInTime,
 		kFeaturesCD,
@@ -1176,7 +1176,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "795be7011ec31bf5bb8ce4efdb9ee5d3", 4838904),
 			ES_ESP,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeLostInTime,
 		kFeaturesCD,
@@ -1189,7 +1189,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "795be7011ec31bf5bb8ce4efdb9ee5d3", 4838904),
 			EN_GRB,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeLostInTime,
 		kFeaturesCD,
@@ -1202,7 +1202,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("demo.stk", "c06f8cc20eb239d4c71f225ce3093edf"),
 			UNK_LANG,
 			kPlatformPC,
-			Common::ADGF_DEMO
+			ADGF_DEMO
 		},
 		kGameTypeLostInTime,
 		kFeaturesAdlib,
@@ -1215,7 +1215,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("demo.stk", "2eba8abd9e3878c57307576012dd2fec"),
 			UNK_LANG,
 			kPlatformPC,
-			Common::ADGF_DEMO
+			ADGF_DEMO
 		},
 		kGameTypeLostInTime,
 		kFeaturesAdlib,
@@ -1228,7 +1228,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "32b0f57f5ae79a9ae97e8011df38af42", 157084),
 			EN_GRB,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob3,
 		kFeaturesAdlib,
@@ -1241,7 +1241,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "16b014bf32dbd6ab4c5163c44f56fed1", 445104),
 			EN_GRB,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob3,
 		kFeaturesAdlib,
@@ -1258,7 +1258,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			},
 			EN_GRB,
 			kPlatformMacintosh,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob3,
 		kFeaturesAdlib,
@@ -1271,7 +1271,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("intro.stk", "1e2f64ec8dfa89f42ee49936a27e66e7"),
 			EN_USA,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob3,
 		kFeaturesAdlib,
@@ -1284,7 +1284,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("intro.stk", "f6d225b25a180606fa5dbe6405c97380"),
 			DE_DEU,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob3,
 		kFeaturesAdlib,
@@ -1297,7 +1297,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("intro.stk", "e42a4f2337d6549487a80864d7826972"),
 			FR_FRA,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob3,
 		kFeaturesAdlib,
@@ -1310,7 +1310,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "fe8144daece35538085adb59c2d29613", 159402),
 			IT_ITA,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob3,
 		kFeaturesAdlib,
@@ -1323,7 +1323,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("intro.stk", "4e3af248a48a2321364736afab868527"),
 			RU_RUS,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob3,
 		kFeaturesAdlib,
@@ -1336,7 +1336,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("intro.stk", "8d28ce1591b0e9cc79bf41cad0fc4c9c"),
 			UNK_LANG,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob3,
 		kFeaturesAdlib,
@@ -1349,7 +1349,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "d3b72938fbbc8159198088811f9e6d19", 160382),
 			ES_ESP,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob3,
 		kFeaturesAdlib,
@@ -1362,7 +1362,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("intro.stk", "bd679eafde2084d8011f247e51b5a805"),
 			EN_GRB,
 			kPlatformAmiga,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob3,
 		kFeaturesNone,
@@ -1375,7 +1375,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("intro.stk", "bd679eafde2084d8011f247e51b5a805"),
 			DE_DEU,
 			kPlatformAmiga,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob3,
 		kFeaturesNone,
@@ -1388,7 +1388,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("intro.stk", "6f2c226c62dd7ab0ab6f850e89d3fc47"),
 			EN_USA,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob3,
 		kFeaturesCD,
@@ -1401,7 +1401,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("intro.stk", "c3e9132ea9dc0fb866b6d60dcda10261"),
 			EN_ANY,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob3,
 		kFeaturesCD,
@@ -1414,7 +1414,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("intro.stk", "c3e9132ea9dc0fb866b6d60dcda10261"),
 			DE_DEU,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob3,
 		kFeaturesCD,
@@ -1427,7 +1427,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("intro.stk", "c3e9132ea9dc0fb866b6d60dcda10261"),
 			FR_FRA,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob3,
 		kFeaturesCD,
@@ -1440,7 +1440,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("intro.stk", "c3e9132ea9dc0fb866b6d60dcda10261"),
 			IT_ITA,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob3,
 		kFeaturesCD,
@@ -1453,7 +1453,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("intro.stk", "c3e9132ea9dc0fb866b6d60dcda10261"),
 			ES_ESP,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob3,
 		kFeaturesCD,
@@ -1466,7 +1466,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("intro.stk", "7aebd94e49c2c5c518c9e7b74f25de9d"),
 			FR_FRA,
 			kPlatformPC,
-			Common::ADGF_DEMO
+			ADGF_DEMO
 		},
 		kGameTypeGob3,
 		kFeaturesAdlib,
@@ -1479,7 +1479,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("intro.stk", "e5dcbc9f6658ebb1e8fe26bc4da0806d"),
 			FR_FRA,
 			kPlatformPC,
-			Common::ADGF_DEMO
+			ADGF_DEMO
 		},
 		kGameTypeGob3,
 		kFeaturesAdlib,
@@ -1492,7 +1492,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1("intro.stk", "b9b898fccebe02b69c086052d5024a55"),
 			UNK_LANG,
 			kPlatformPC,
-			Common::ADGF_DEMO
+			ADGF_DEMO
 		},
 		kGameTypeGob3,
 		kFeaturesAdlib,
@@ -1505,7 +1505,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "9e20ad7b471b01f84db526da34eaf0a2", 395561),
 			EN_ANY,
 			kPlatformPC,
-			Common::ADGF_DEMO
+			ADGF_DEMO
 		},
 		kGameTypeGob3,
 		kFeaturesAdlib,
@@ -1518,7 +1518,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "47c3b452767c4f49ea7b109143e77c30", 916828),
 			EN_USA,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeInca2,
 		kFeaturesCD,
@@ -1531,7 +1531,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "47c3b452767c4f49ea7b109143e77c30", 916828),
 			DE_DEU,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeInca2,
 		kFeaturesCD,
@@ -1544,7 +1544,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "47c3b452767c4f49ea7b109143e77c30", 916828),
 			FR_FRA,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeInca2,
 		kFeaturesCD,
@@ -1557,7 +1557,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "47c3b452767c4f49ea7b109143e77c30", 916828),
 			IT_ITA,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeInca2,
 		kFeaturesCD,
@@ -1570,7 +1570,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "47c3b452767c4f49ea7b109143e77c30", 916828),
 			ES_ESP,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeInca2,
 		kFeaturesCD,
@@ -1583,7 +1583,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "1fa92b00fe80a20f34ec34a8e2fa869e", 923072),
 			EN_USA,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeInca2,
 		kFeaturesAdlib,
@@ -1596,7 +1596,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "1fa92b00fe80a20f34ec34a8e2fa869e", 923072),
 			FR_FRA,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeInca2,
 		kFeaturesAdlib,
@@ -1609,7 +1609,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "1fa92b00fe80a20f34ec34a8e2fa869e", 923072),
 			DE_DEU,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeInca2,
 		kFeaturesAdlib,
@@ -1622,7 +1622,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "dccf9d31cb720b34d75487408821b77e", 20296390),
 			EN_GRB,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeWoodruff,
 		kFeatures640,
@@ -1635,7 +1635,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "dccf9d31cb720b34d75487408821b77e", 20296390),
 			DE_DEU,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeWoodruff,
 		kFeatures640,
@@ -1648,7 +1648,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "dccf9d31cb720b34d75487408821b77e", 20296390),
 			FR_FRA,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeWoodruff,
 		kFeatures640,
@@ -1661,7 +1661,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "dccf9d31cb720b34d75487408821b77e", 20296390),
 			IT_ITA,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeWoodruff,
 		kFeatures640,
@@ -1674,7 +1674,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "dccf9d31cb720b34d75487408821b77e", 20296390),
 			ES_ESP,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeWoodruff,
 		kFeatures640,
@@ -1687,7 +1687,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "b50fee012a5abcd0ac2963e1b4b56bec", 20298108),
 			EN_GRB,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeWoodruff,
 		kFeatures640,
@@ -1700,7 +1700,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "b50fee012a5abcd0ac2963e1b4b56bec", 20298108),
 			DE_DEU,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeWoodruff,
 		kFeatures640,
@@ -1713,7 +1713,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "b50fee012a5abcd0ac2963e1b4b56bec", 20298108),
 			FR_FRA,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeWoodruff,
 		kFeatures640,
@@ -1726,7 +1726,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "b50fee012a5abcd0ac2963e1b4b56bec", 20298108),
 			IT_ITA,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeWoodruff,
 		kFeatures640,
@@ -1739,7 +1739,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "b50fee012a5abcd0ac2963e1b4b56bec", 20298108),
 			ES_ESP,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeWoodruff,
 		kFeatures640,
@@ -1752,7 +1752,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "5f5f4e0a72c33391e67a47674b120cc6", 20296422),
 			DE_DEU,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeWoodruff,
 		kFeatures640,
@@ -1765,7 +1765,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "270529d9b8cce770b1575908a3800b52", 20296452),
 			ES_ESP,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeWoodruff,
 		kFeatures640,
@@ -1778,7 +1778,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "270529d9b8cce770b1575908a3800b52", 20296452),
 			EN_GRB,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeWoodruff,
 		kFeatures640,
@@ -1791,7 +1791,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "270529d9b8cce770b1575908a3800b52", 20296452),
 			DE_DEU,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeWoodruff,
 		kFeatures640,
@@ -1804,7 +1804,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "270529d9b8cce770b1575908a3800b52", 20296452),
 			FR_FRA,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeWoodruff,
 		kFeatures640,
@@ -1817,7 +1817,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "270529d9b8cce770b1575908a3800b52", 20296452),
 			IT_ITA,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeWoodruff,
 		kFeatures640,
@@ -1830,7 +1830,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "f4c344023b073782d2fddd9d8b515318", 7069736),
 			IT_ITA,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeWoodruff,
 		kFeatures640,
@@ -1843,7 +1843,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "f4c344023b073782d2fddd9d8b515318", 7069736),
 			DE_DEU,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeWoodruff,
 		kFeatures640,
@@ -1856,7 +1856,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "f4c344023b073782d2fddd9d8b515318", 7069736),
 			FR_FRA,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeWoodruff,
 		kFeatures640,
@@ -1869,7 +1869,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "60348a87651f92e8492ee070556a96d8", 7069736),
 			EN_GRB,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeWoodruff,
 		kFeatures640,
@@ -1882,7 +1882,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "60348a87651f92e8492ee070556a96d8", 7069736),
 			DE_DEU,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeWoodruff,
 		kFeatures640,
@@ -1895,7 +1895,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "60348a87651f92e8492ee070556a96d8", 7069736),
 			FR_FRA,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeWoodruff,
 		kFeatures640,
@@ -1908,7 +1908,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "60348a87651f92e8492ee070556a96d8", 7069736),
 			IT_ITA,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeWoodruff,
 		kFeatures640,
@@ -1921,7 +1921,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "60348a87651f92e8492ee070556a96d8", 7069736),
 			ES_ESP,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeWoodruff,
 		kFeatures640,
@@ -1934,7 +1934,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "08a96bf061af1fa4f75c6a7cc56b60a4", 20734979),
 			PL_POL,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeWoodruff,
 		kFeatures640,
@@ -1947,7 +1947,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "6190e32404b672f4bbbc39cf76f41fda", 2511470),
 			EN_USA,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeDynasty,
 		kFeatures640,
@@ -1960,7 +1960,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "61e4069c16e27775a6cc6d20f529fb36", 2511300),
 			EN_USA,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeDynasty,
 		kFeatures640,
@@ -1973,7 +1973,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "61e4069c16e27775a6cc6d20f529fb36", 2511300),
 			FR_FRA,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeDynasty,
 		kFeatures640,
@@ -1986,7 +1986,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "464538a17ed39755d7f1ba9c751af1bd", 1847864),
 			EN_USA,
 			kPlatformPC,
-			Common::ADGF_DEMO
+			ADGF_DEMO
 		},
 		kGameTypeDynasty,
 		kFeatures640,
@@ -1999,7 +1999,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "3ab2c542bd9216ae5d02cc6f45701ae1", 1252436),
 			EN_USA,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeUrban,
 		kFeatures640,
@@ -2012,7 +2012,7 @@ static const GOBGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("intro.stk", "b991ed1d31c793e560edefdb349882ef", 1276408),
 			FR_FRA,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeUrban,
 		kFeatures640,
@@ -2029,7 +2029,7 @@ static const GOBGameDescription fallbackDescs[] = {
 			AD_ENTRY1(0, 0),
 			UNK_LANG,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob1,
 		kFeaturesNone,
@@ -2042,7 +2042,7 @@ static const GOBGameDescription fallbackDescs[] = {
 			AD_ENTRY1(0, 0),
 			UNK_LANG,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob1,
 		kFeaturesCD,
@@ -2055,7 +2055,7 @@ static const GOBGameDescription fallbackDescs[] = {
 			AD_ENTRY1(0, 0),
 			UNK_LANG,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob2,
 		kFeaturesAdlib,
@@ -2068,7 +2068,7 @@ static const GOBGameDescription fallbackDescs[] = {
 			AD_ENTRY1(0, 0),
 			UNK_LANG,
 			kPlatformMacintosh,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob2,
 		kFeaturesAdlib,
@@ -2081,7 +2081,7 @@ static const GOBGameDescription fallbackDescs[] = {
 			AD_ENTRY1(0, 0),
 			UNK_LANG,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob2,
 		kFeaturesCD,
@@ -2094,7 +2094,7 @@ static const GOBGameDescription fallbackDescs[] = {
 			AD_ENTRY1(0, 0),
 			UNK_LANG,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeBargon,
 		kFeaturesNone,
@@ -2107,7 +2107,7 @@ static const GOBGameDescription fallbackDescs[] = {
 			AD_ENTRY1(0, 0),
 			UNK_LANG,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob3,
 		kFeaturesAdlib,
@@ -2120,7 +2120,7 @@ static const GOBGameDescription fallbackDescs[] = {
 			AD_ENTRY1(0, 0),
 			UNK_LANG,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeGob3,
 		kFeaturesCD,
@@ -2133,7 +2133,7 @@ static const GOBGameDescription fallbackDescs[] = {
 			AD_ENTRY1(0, 0),
 			UNK_LANG,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeWoodruff,
 		kFeatures640,
@@ -2146,7 +2146,7 @@ static const GOBGameDescription fallbackDescs[] = {
 			AD_ENTRY1(0, 0),
 			UNK_LANG,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeLostInTime,
 		kFeaturesAdlib,
@@ -2159,7 +2159,7 @@ static const GOBGameDescription fallbackDescs[] = {
 			AD_ENTRY1(0, 0),
 			UNK_LANG,
 			kPlatformMacintosh,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeLostInTime,
 		kFeaturesAdlib,
@@ -2172,7 +2172,7 @@ static const GOBGameDescription fallbackDescs[] = {
 			AD_ENTRY1(0, 0),
 			UNK_LANG,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeLostInTime,
 		kFeaturesCD,
@@ -2185,7 +2185,7 @@ static const GOBGameDescription fallbackDescs[] = {
 			AD_ENTRY1(0, 0),
 			UNK_LANG,
 			kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		kGameTypeUrban,
 		kFeaturesCD,
@@ -2232,9 +2232,9 @@ static const ADParams detectionParams = {
 	0
 };
 
-class GobMetaEngine : public Common::AdvancedMetaEngine {
+class GobMetaEngine : public AdvancedMetaEngine {
 public:
-	GobMetaEngine() : Common::AdvancedMetaEngine(detectionParams) {}
+	GobMetaEngine() : AdvancedMetaEngine(detectionParams) {}
 
 	virtual const char *getName() const {
 		return "Gob Engine";
@@ -2245,7 +2245,7 @@ public:
 	}
 
 	virtual bool hasFeature(MetaEngineFeature f) const;
-	virtual bool createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const;
+	virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
 };
 
 bool GobMetaEngine::hasFeature(MetaEngineFeature f) const {
@@ -2256,7 +2256,7 @@ bool Gob::GobEngine::hasFeature(EngineFeature f) const {
 	return
 		(f == kSupportsRTL);
 }
-bool GobMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const {
+bool GobMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const {
 	const Gob::GOBGameDescription *gd = (const Gob::GOBGameDescription *)desc;
 	if (gd) {
 		*engine = new Gob::GobEngine(syst);