Moved AdvancedDetector from common/ to engines/

svn-id: r36132

1 files changed, 77 insertions, 77 deletions

diff --git a/engines/kyra/detection.cpp b/engines/kyra/detection.cpp
index d0a73800e6..3a1135a0aa 100644
--- a/engines/kyra/detection.cpp
+++ b/engines/kyra/detection.cpp
@@ -29,13 +29,13 @@
 #include "kyra/lol.h"
 
 #include "common/config-manager.h"
-#include "common/advancedDetector.h"
+#include "engines/advancedDetector.h"
 #include "common/savefile.h"
 
 #include "base/plugins.h"
 
 struct KYRAGameDescription {
-	Common::ADGameDescription desc;
+	ADGameDescription desc;
 
 	Kyra::GameFlags flags;
 };
@@ -82,7 +82,7 @@ const KYRAGameDescription adGameDescs[] = {
 			AD_ENTRY1("DISK1.EXE", "c8641d0414d6c966d0a3dad79db07bf4"),
 			Common::EN_ANY,
 			Common::kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		KYRA1_FLOPPY_CMP_FLAGS
 	},
@@ -94,7 +94,7 @@ const KYRAGameDescription adGameDescs[] = {
 			AD_ENTRY1("DISK1.EXE", "5d5cee4c3d0b68d586788b74243d254a"),
 			Common::DE_DEU,
 			Common::kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		KYRA1_FLOPPY_CMP_FLAGS
 	},
@@ -107,7 +107,7 @@ const KYRAGameDescription adGameDescs[] = {
 			AD_ENTRY1("GEMCUT.EMC", "3c244298395520bb62b5edfe41688879"),
 			Common::EN_ANY,
 			Common::kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		KYRA1_FLOPPY_FLAGS
 	},
@@ -118,7 +118,7 @@ const KYRAGameDescription adGameDescs[] = {
 			AD_ENTRY1("GEMCUT.EMC", "796e44863dd22fa635b042df1bf16673"),
 			Common::EN_ANY,
 			Common::kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		KYRA1_FLOPPY_FLAGS
 	},
@@ -129,7 +129,7 @@ const KYRAGameDescription adGameDescs[] = {
 			AD_ENTRY1("GEMCUT.EMC", "abf8eb360e79a6c2a837751fbd4d3d24"),
 			Common::FR_FRA,
 			Common::kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		KYRA1_FLOPPY_FLAGS
 	},
@@ -140,7 +140,7 @@ const KYRAGameDescription adGameDescs[] = {
 			AD_ENTRY1("GEMCUT.EMC", "6018e1dfeaca7fe83f8d0b00eb0dd049"),
 			Common::DE_DEU,
 			Common::kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		KYRA1_FLOPPY_FLAGS
 	},
@@ -151,7 +151,7 @@ const KYRAGameDescription adGameDescs[] = {
 			AD_ENTRY1("GEMCUT.EMC", "f0b276781f47c130f423ec9679fe9ed9"),
 			Common::DE_DEU,
 			Common::kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		KYRA1_FLOPPY_FLAGS
 	},
@@ -162,7 +162,7 @@ const KYRAGameDescription adGameDescs[] = {
 			AD_ENTRY1("GEMCUT.EMC", "8909b41596913b3f5deaf3c9f1017b01"),
 			Common::ES_ESP,
 			Common::kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		KYRA1_FLOPPY_FLAGS
 	},
@@ -173,7 +173,7 @@ const KYRAGameDescription adGameDescs[] = {
 			AD_ENTRY1("GEMCUT.EMC", "747861d2a9c643c59fdab570df5b9093"),
 			Common::ES_ESP,
 			Common::kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		KYRA1_FLOPPY_FLAGS
 	},
@@ -184,7 +184,7 @@ const KYRAGameDescription adGameDescs[] = {
 			AD_ENTRY1("GEMCUT.EMC", "ef08c8c237ee1473fd52578303fc36df"),
 			Common::IT_ITA,
 			Common::kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		KYRA1_FLOPPY_FLAGS
 	},
@@ -196,7 +196,7 @@ const KYRAGameDescription adGameDescs[] = {
 			AD_ENTRY1("GEMCUT.PAK", "2bd1da653eaefd691e050e4a9eb68a64"),
 			Common::EN_ANY,
 			Common::kPlatformAmiga,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		KYRA1_AMIGA_FLAGS
 	},
@@ -212,7 +212,7 @@ const KYRAGameDescription adGameDescs[] = {
 			},
 			Common::EN_ANY,
 			Common::kPlatformMacintosh,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		KYRA1_FLOPPY_FLAGS
 	},
@@ -228,7 +228,7 @@ const KYRAGameDescription adGameDescs[] = {
 			},
 			Common::EN_ANY,
 			Common::kPlatformFMTowns,
-			Common::ADGF_CD
+			ADGF_CD
 		},
 		KYRA1_TOWNS_FLAGS
 	},
@@ -243,7 +243,7 @@ const KYRAGameDescription adGameDescs[] = {
 			},
 			Common::JA_JPN,
 			Common::kPlatformFMTowns,
-			Common::ADGF_CD
+			ADGF_CD
 		},
 		KYRA1_TOWNS_SJIS_FLAGS
 	},
@@ -259,7 +259,7 @@ const KYRAGameDescription adGameDescs[] = {
 			},
 			Common::EN_ANY,
 			Common::kPlatformPC98,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		KYRA1_TOWNS_FLAGS
 	},
@@ -274,7 +274,7 @@ const KYRAGameDescription adGameDescs[] = {
 			},
 			Common::JA_JPN,
 			Common::kPlatformPC98,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		KYRA1_TOWNS_SJIS_FLAGS
 	},
@@ -286,7 +286,7 @@ const KYRAGameDescription adGameDescs[] = {
 			AD_ENTRY1("GEMCUT.PAK", "fac399fe62f98671e56a005c5e94e39f"),
 			Common::EN_ANY,
 			Common::kPlatformPC,
-			Common::ADGF_CD
+			ADGF_CD
 		},
 		KYRA1_CD_FLAGS
 	},
@@ -297,7 +297,7 @@ const KYRAGameDescription adGameDescs[] = {
 			AD_ENTRY1("GEMCUT.PAK", "230f54e6afc007ab4117159181a1c722"),
 			Common::DE_DEU,
 			Common::kPlatformPC,
-			Common::ADGF_CD
+			ADGF_CD
 		},
 		KYRA1_CD_FLAGS
 	},
@@ -308,7 +308,7 @@ const KYRAGameDescription adGameDescs[] = {
 			AD_ENTRY1("GEMCUT.PAK", "b037c41768b652a040360ffa3556fd2a"),
 			Common::FR_FRA,
 			Common::kPlatformPC,
-			Common::ADGF_CD
+			ADGF_CD
 		},
 		KYRA1_CD_FLAGS
 	},
@@ -320,7 +320,7 @@ const KYRAGameDescription adGameDescs[] = {
 			AD_ENTRY1("GEMCUT.PAK", "d8327fc4b7a72b23c900fa13aef4093a"),
 			Common::IT_ITA,
 			Common::kPlatformPC,
-			Common::ADGF_CD
+			ADGF_CD
 		},
 		KYRA1_CD_FLAGS
 	},
@@ -332,7 +332,7 @@ const KYRAGameDescription adGameDescs[] = {
 			AD_ENTRY1("DEMO1.WSA", "fb722947d94897512b13b50cc84fd648"),
 			Common::EN_ANY,
 			Common::kPlatformPC,
-			Common::ADGF_DEMO
+			ADGF_DEMO
 		},
 		KYRA1_DEMO_FLAGS
 	},
@@ -344,7 +344,7 @@ const KYRAGameDescription adGameDescs[] = {
 			AD_ENTRY1("WESTWOOD.001", "3f52dda68c4f7696c8309038be9f4151"),
 			Common::EN_ANY,
 			Common::kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		KYRA2_FLOPPY_CMP_FLAGS
 	},
@@ -356,7 +356,7 @@ const KYRAGameDescription adGameDescs[] = {
 			AD_ENTRY1("WESTWOOD.001", "d787b9559afddfe058b84c0b3a787224"),
 			Common::DE_DEU,
 			Common::kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		KYRA2_FLOPPY_CMP_FLAGS
 	},
@@ -368,7 +368,7 @@ const KYRAGameDescription adGameDescs[] = {
 			AD_ENTRY1("FATE.PAK", "1ba18be685ad8e5a0ab5d46a0ce4d345"),
 			Common::EN_ANY,
 			Common::kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		KYRA2_FLOPPY_FLAGS
 	},
@@ -380,7 +380,7 @@ const KYRAGameDescription adGameDescs[] = {
 			AD_ENTRY1("FATE.PAK", "262fb69dd8e52e596c7aefc6456f7c1b"),
 			Common::DE_DEU,
 			Common::kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		KYRA2_FLOPPY_FLAGS
 	},
@@ -392,7 +392,7 @@ const KYRAGameDescription adGameDescs[] = {
 			AD_ENTRY1("FATE.PAK", "f7de11506b4c8fdf64bc763206c3e4e7"),
 			Common::FR_FRA,
 			Common::kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		KYRA2_FLOPPY_FLAGS
 	},
@@ -404,7 +404,7 @@ const KYRAGameDescription adGameDescs[] = {
 			AD_ENTRY1("FATE.PAK", "e0a70c31b022cb4bb3061890020fc27c"),
 			Common::IT_ITA,
 			Common::kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		KYRA2_FLOPPY_FLAGS
 	},
@@ -416,7 +416,7 @@ const KYRAGameDescription adGameDescs[] = {
 			AD_ENTRY1("FATE.PAK", "28cbad1c5bf06b2d3825ae57d760d032"),
 			Common::EN_ANY,
 			Common::kPlatformPC,
-			Common::ADGF_DROPLANGUAGE | Common::ADGF_CD
+			ADGF_DROPLANGUAGE | ADGF_CD
 		},
 		KYRA2_CD_FLAGS
 	},
@@ -427,7 +427,7 @@ const KYRAGameDescription adGameDescs[] = {
 			AD_ENTRY1("FATE.PAK", "28cbad1c5bf06b2d3825ae57d760d032"),
 			Common::DE_DEU,
 			Common::kPlatformPC,
-			Common::ADGF_DROPLANGUAGE | Common::ADGF_CD
+			ADGF_DROPLANGUAGE | ADGF_CD
 		},
 		KYRA2_CD_FLAGS
 	},
@@ -438,7 +438,7 @@ const KYRAGameDescription adGameDescs[] = {
 			AD_ENTRY1("FATE.PAK", "28cbad1c5bf06b2d3825ae57d760d032"),
 			Common::FR_FRA,
 			Common::kPlatformPC,
-			Common::ADGF_DROPLANGUAGE | Common::ADGF_CD
+			ADGF_DROPLANGUAGE | ADGF_CD
 		},
 		KYRA2_CD_FLAGS
 	},
@@ -451,7 +451,7 @@ const KYRAGameDescription adGameDescs[] = {
 			AD_ENTRY1("FATE.PAK", "30487f3b8d7790c7857f4769ff2dd125"),
 			Common::IT_ITA,
 			Common::kPlatformPC,
-			Common::ADGF_DROPLANGUAGE | Common::ADGF_CD
+			ADGF_DROPLANGUAGE | ADGF_CD
 		},
 		KYRA2_CD_FAN_FLAGS(Common::IT_ITA, Common::EN_ANY)
 	},
@@ -462,7 +462,7 @@ const KYRAGameDescription adGameDescs[] = {
 			AD_ENTRY1("FATE.PAK", "30487f3b8d7790c7857f4769ff2dd125"),
 			Common::DE_DEU,
 			Common::kPlatformPC,
-			Common::ADGF_DROPLANGUAGE | Common::ADGF_CD
+			ADGF_DROPLANGUAGE | ADGF_CD
 		},
 		KYRA2_CD_FAN_FLAGS(Common::IT_ITA, Common::EN_ANY)
 	},
@@ -473,7 +473,7 @@ const KYRAGameDescription adGameDescs[] = {
 			AD_ENTRY1("FATE.PAK", "30487f3b8d7790c7857f4769ff2dd125"),
 			Common::FR_FRA,
 			Common::kPlatformPC,
-			Common::ADGF_DROPLANGUAGE | Common::ADGF_CD
+			ADGF_DROPLANGUAGE | ADGF_CD
 		},
 		KYRA2_CD_FAN_FLAGS(Common::IT_ITA, Common::EN_ANY)
 	},
@@ -485,7 +485,7 @@ const KYRAGameDescription adGameDescs[] = {
 			AD_ENTRY1("FATE.PAK", "39772ff82e42c4c520050518deb82e64"),
 			Common::IT_ITA,
 			Common::kPlatformPC,
-			Common::ADGF_DROPLANGUAGE | Common::ADGF_CD
+			ADGF_DROPLANGUAGE | ADGF_CD
 		},
 		KYRA2_CD_FAN_FLAGS(Common::IT_ITA, Common::EN_ANY)
 	},
@@ -497,7 +497,7 @@ const KYRAGameDescription adGameDescs[] = {
 			AD_ENTRY1("FATE.PAK", "39772ff82e42c4c520050518deb82e64"),
 			Common::DE_DEU,
 			Common::kPlatformPC,
-			Common::ADGF_DROPLANGUAGE | Common::ADGF_CD
+			ADGF_DROPLANGUAGE | ADGF_CD
 		},
 		KYRA2_CD_FAN_FLAGS(Common::IT_ITA, Common::EN_ANY)
 	},
@@ -509,7 +509,7 @@ const KYRAGameDescription adGameDescs[] = {
 			AD_ENTRY1("FATE.PAK", "39772ff82e42c4c520050518deb82e64"),
 			Common::FR_FRA,
 			Common::kPlatformPC,
-			Common::ADGF_DROPLANGUAGE | Common::ADGF_CD
+			ADGF_DROPLANGUAGE | ADGF_CD
 		},
 		KYRA2_CD_FAN_FLAGS(Common::IT_ITA, Common::EN_ANY)
 	},
@@ -521,7 +521,7 @@ const KYRAGameDescription adGameDescs[] = {
 			AD_ENTRY1("THANKS.CPS", "b1a78d990b120bb2234b7094f74e30a5"),
 			Common::EN_ANY,
 			Common::kPlatformPC,
-			Common::ADGF_DROPLANGUAGE | Common::ADGF_CD | Common::ADGF_DEMO
+			ADGF_DROPLANGUAGE | ADGF_CD | ADGF_DEMO
 		},
 		KYRA2_CD_DEMO_FLAGS
 	},
@@ -533,7 +533,7 @@ const KYRAGameDescription adGameDescs[] = {
 			AD_ENTRY1("THANKS.CPS", "b1a78d990b120bb2234b7094f74e30a5"),
 			Common::DE_DEU,
 			Common::kPlatformPC,
-			Common::ADGF_DROPLANGUAGE | Common::ADGF_CD | Common::ADGF_DEMO
+			ADGF_DROPLANGUAGE | ADGF_CD | ADGF_DEMO
 		},
 		KYRA2_CD_DEMO_FLAGS
 	},
@@ -545,7 +545,7 @@ const KYRAGameDescription adGameDescs[] = {
 			AD_ENTRY1("THANKS.CPS", "b1a78d990b120bb2234b7094f74e30a5"),
 			Common::FR_FRA,
 			Common::kPlatformPC,
-			Common::ADGF_DROPLANGUAGE | Common::ADGF_CD | Common::ADGF_DEMO
+			ADGF_DROPLANGUAGE | ADGF_CD | ADGF_DEMO
 		},
 		KYRA2_CD_DEMO_FLAGS
 	},
@@ -557,7 +557,7 @@ const KYRAGameDescription adGameDescs[] = {
 			AD_ENTRY1("VOC.PAK", "ecb3561b63749158172bf21528cf5f45"),
 			Common::EN_ANY,
 			Common::kPlatformPC,
-			Common::ADGF_DEMO
+			ADGF_DEMO
 		},
 		KYRA2_DEMO_FLAGS
 	},
@@ -569,7 +569,7 @@ const KYRAGameDescription adGameDescs[] = {
 			AD_ENTRY1("WSCORE.PAK", "c44de1302b67f27d4707409987b7a685"),
 			Common::EN_ANY,
 			Common::kPlatformFMTowns,
-			Common::ADGF_CD
+			ADGF_CD
 		},
 		KYRA2_TOWNS_FLAGS
 	},
@@ -580,7 +580,7 @@ const KYRAGameDescription adGameDescs[] = {
 			AD_ENTRY1("WSCORE.PAK", "c44de1302b67f27d4707409987b7a685"),
 			Common::JA_JPN,
 			Common::kPlatformFMTowns,
-			Common::ADGF_CD
+			ADGF_CD
 		},
 		KYRA2_TOWNS_SJIS_FLAGS
 	},
@@ -591,7 +591,7 @@ const KYRAGameDescription adGameDescs[] = {
 			AD_ENTRY1("WSCORE.PAK", "c44de1302b67f27d4707409987b7a685"),
 			Common::EN_ANY,
 			Common::kPlatformPC98,
-			Common::ADGF_CD
+			ADGF_CD
 		},
 		KYRA2_TOWNS_FLAGS
 	},
@@ -602,7 +602,7 @@ const KYRAGameDescription adGameDescs[] = {
 			AD_ENTRY1("WSCORE.PAK", "c44de1302b67f27d4707409987b7a685"),
 			Common::JA_JPN,
 			Common::kPlatformPC98,
-			Common::ADGF_CD
+			ADGF_CD
 		},
 		KYRA2_TOWNS_SJIS_FLAGS
 	},
@@ -621,7 +621,7 @@ const KYRAGameDescription adGameDescs[] = {
 			},
 			Common::EN_ANY,
 			Common::kPlatformPC,
-			Common::ADGF_DROPLANGUAGE
+			ADGF_DROPLANGUAGE
 		},
 		KYRA3_CD_FLAGS
 	},
@@ -636,7 +636,7 @@ const KYRAGameDescription adGameDescs[] = {
 			},
 			Common::DE_DEU,
 			Common::kPlatformPC,
-			Common::ADGF_DROPLANGUAGE
+			ADGF_DROPLANGUAGE
 		},
 		KYRA3_CD_FLAGS
 	},
@@ -651,7 +651,7 @@ const KYRAGameDescription adGameDescs[] = {
 			},
 			Common::FR_FRA,
 			Common::kPlatformPC,
-			Common::ADGF_DROPLANGUAGE
+			ADGF_DROPLANGUAGE
 		},
 		KYRA3_CD_FLAGS
 	},
@@ -668,7 +668,7 @@ const KYRAGameDescription adGameDescs[] = {
 			},
 			Common::EN_ANY,
 			Common::kPlatformPC,
-			Common::ADGF_DROPLANGUAGE
+			ADGF_DROPLANGUAGE
 		},
 		KYRA3_CD_INS_FLAGS
 	},
@@ -683,7 +683,7 @@ const KYRAGameDescription adGameDescs[] = {
 			},
 			Common::DE_DEU,
 			Common::kPlatformPC,
-			Common::ADGF_DROPLANGUAGE
+			ADGF_DROPLANGUAGE
 		},
 		KYRA3_CD_INS_FLAGS
 	},
@@ -698,7 +698,7 @@ const KYRAGameDescription adGameDescs[] = {
 			},
 			Common::FR_FRA,
 			Common::kPlatformPC,
-			Common::ADGF_DROPLANGUAGE
+			ADGF_DROPLANGUAGE
 		},
 		KYRA3_CD_INS_FLAGS
 	},
@@ -715,7 +715,7 @@ const KYRAGameDescription adGameDescs[] = {
 			},
 			Common::EN_ANY,
 			Common::kPlatformMacintosh,
-			Common::ADGF_DROPLANGUAGE
+			ADGF_DROPLANGUAGE
 		},
 		KYRA3_CD_INS_FLAGS
 	},
@@ -730,7 +730,7 @@ const KYRAGameDescription adGameDescs[] = {
 			},
 			Common::DE_DEU,
 			Common::kPlatformMacintosh,
-			Common::ADGF_DROPLANGUAGE
+			ADGF_DROPLANGUAGE
 		},
 		KYRA3_CD_INS_FLAGS
 	},
@@ -745,7 +745,7 @@ const KYRAGameDescription adGameDescs[] = {
 			},
 			Common::FR_FRA,
 			Common::kPlatformMacintosh,
-			Common::ADGF_DROPLANGUAGE
+			ADGF_DROPLANGUAGE
 		},
 		KYRA3_CD_INS_FLAGS
 	},
@@ -762,7 +762,7 @@ const KYRAGameDescription adGameDescs[] = {
 			},
 			Common::ES_ESP,
 			Common::kPlatformPC,
-			Common::ADGF_DROPLANGUAGE
+			ADGF_DROPLANGUAGE
 		},
 		KYRA3_CD_FAN_FLAGS(Common::ES_ESP, Common::EN_ANY)
 	},
@@ -777,7 +777,7 @@ const KYRAGameDescription adGameDescs[] = {
 			},
 			Common::DE_DEU,
 			Common::kPlatformPC,
-			Common::ADGF_DROPLANGUAGE
+			ADGF_DROPLANGUAGE
 		},
 		KYRA3_CD_FAN_FLAGS(Common::ES_ESP, Common::EN_ANY)
 	},
@@ -792,7 +792,7 @@ const KYRAGameDescription adGameDescs[] = {
 			},
 			Common::FR_FRA,
 			Common::kPlatformPC,
-			Common::ADGF_DROPLANGUAGE
+			ADGF_DROPLANGUAGE
 		},
 		KYRA3_CD_FAN_FLAGS(Common::ES_ESP, Common::EN_ANY)
 	},
@@ -809,7 +809,7 @@ const KYRAGameDescription adGameDescs[] = {
 			},
 			Common::EN_ANY,
 			Common::kPlatformPC,
-			Common::ADGF_DROPLANGUAGE
+			ADGF_DROPLANGUAGE
 		},
 		KYRA3_CD_FAN_FLAGS(Common::IT_ITA, Common::FR_FRA)
 	},
@@ -824,7 +824,7 @@ const KYRAGameDescription adGameDescs[] = {
 			},
 			Common::DE_DEU,
 			Common::kPlatformPC,
-			Common::ADGF_DROPLANGUAGE
+			ADGF_DROPLANGUAGE
 		},
 		KYRA3_CD_FAN_FLAGS(Common::IT_ITA, Common::FR_FRA)
 	},
@@ -839,7 +839,7 @@ const KYRAGameDescription adGameDescs[] = {
 			},
 			Common::IT_ITA,
 			Common::kPlatformPC,
-			Common::ADGF_DROPLANGUAGE
+			ADGF_DROPLANGUAGE
 		},
 		KYRA3_CD_FAN_FLAGS(Common::IT_ITA, Common::FR_FRA)
 	},
@@ -856,7 +856,7 @@ const KYRAGameDescription adGameDescs[] = {
 			},
 			Common::EN_ANY,
 			Common::kPlatformPC,
-			Common::ADGF_DROPLANGUAGE | Common::ADGF_CD
+			ADGF_DROPLANGUAGE | ADGF_CD
 		},
 		LOL_CD_FLAGS
 	},
@@ -872,7 +872,7 @@ const KYRAGameDescription adGameDescs[] = {
 			},
 			Common::DE_DEU,
 			Common::kPlatformPC,
-			Common::ADGF_DROPLANGUAGE | Common::ADGF_CD
+			ADGF_DROPLANGUAGE | ADGF_CD
 		},
 		LOL_CD_FLAGS
 	},
@@ -888,7 +888,7 @@ const KYRAGameDescription adGameDescs[] = {
 			},
 			Common::FR_FRA,
 			Common::kPlatformPC,
-			Common::ADGF_DROPLANGUAGE | Common::ADGF_CD
+			ADGF_DROPLANGUAGE | ADGF_CD
 		},
 		LOL_CD_FLAGS
 	},
@@ -904,7 +904,7 @@ const KYRAGameDescription adGameDescs[] = {
 			},
 			Common::EN_ANY,
 			Common::kPlatformPC,
-			Common::ADGF_DROPLANGUAGE | Common::ADGF_CD
+			ADGF_DROPLANGUAGE | ADGF_CD
 		},
 		LOL_CD_FLAGS
 	},
@@ -920,7 +920,7 @@ const KYRAGameDescription adGameDescs[] = {
 			},
 			Common::DE_DEU,
 			Common::kPlatformPC,
-			Common::ADGF_DROPLANGUAGE | Common::ADGF_CD
+			ADGF_DROPLANGUAGE | ADGF_CD
 		},
 		LOL_CD_FLAGS
 	},
@@ -936,7 +936,7 @@ const KYRAGameDescription adGameDescs[] = {
 			},
 			Common::FR_FRA,
 			Common::kPlatformPC,
-			Common::ADGF_DROPLANGUAGE | Common::ADGF_CD
+			ADGF_DROPLANGUAGE | ADGF_CD
 		},
 		LOL_CD_FLAGS
 	},
@@ -951,7 +951,7 @@ const KYRAGameDescription adGameDescs[] = {
 			},
 			Common::DE_DEU,
 			Common::kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		LOL_FLOPPY_CMP_FLAGS
 	},
@@ -967,7 +967,7 @@ const KYRAGameDescription adGameDescs[] = {
 			},
 			Common::DE_DEU,
 			Common::kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		LOL_FLOPPY_FLAGS
 	},
@@ -984,7 +984,7 @@ const KYRAGameDescription adGameDescs[] = {
 			},
 			Common::EN_ANY,
 			Common::kPlatformPC98,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		LOL_PC98_FLAGS
 	},
@@ -1000,7 +1000,7 @@ const KYRAGameDescription adGameDescs[] = {
 			},
 			Common::JA_JPN,
 			Common::kPlatformPC98,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		LOL_PC98_SJIS_FLAGS
 	},*/
@@ -1015,7 +1015,7 @@ const KYRAGameDescription adGameDescs[] = {
 			},
 			Common::EN_ANY,
 			Common::kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		LOL_DEMO_FLAGS
 	},
@@ -1031,7 +1031,7 @@ const PlainGameDescriptor gameList[] = {
 	{ 0, 0 }
 };
 
-const Common::ADParams detectionParams = {
+const ADParams detectionParams = {
 	// Pointer to ADGameDescription or its superset structure
 	(const byte *)adGameDescs,
 	// Size of that superset structure
@@ -1052,9 +1052,9 @@ const Common::ADParams detectionParams = {
 
 } // End of anonymous namespace
 
-class KyraMetaEngine : public Common::AdvancedMetaEngine {
+class KyraMetaEngine : public AdvancedMetaEngine {
 public:
-	KyraMetaEngine() : Common::AdvancedMetaEngine(detectionParams) {}
+	KyraMetaEngine() : AdvancedMetaEngine(detectionParams) {}
 
 	const char *getName() const {
 		return "Legend of Kyrandia Engine";
@@ -1065,7 +1065,7 @@ public:
 	}
 
 	bool hasFeature(MetaEngineFeature f) const;
-	bool createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const;
+	bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
 	SaveStateList listSaves(const char *target) const;
 	virtual int getMaximumSaveSlot() const;
 	void removeSaveState(const char *target, int slot) const;
@@ -1088,7 +1088,7 @@ bool Kyra::KyraEngine_v1::hasFeature(EngineFeature f) const {
 		(f == kSupportsSavingDuringRuntime);
 }
 
-bool KyraMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const {
+bool KyraMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const {
 	const KYRAGameDescription *gd = (const KYRAGameDescription *)desc;
 	bool res = true;