diff options
Diffstat (limited to 'engines')
42 files changed, 1403 insertions, 1461 deletions
diff --git a/engines/advancedDetector.h b/engines/advancedDetector.h index 7d16f4aad2..9a6b5e4ef7 100644 --- a/engines/advancedDetector.h +++ b/engines/advancedDetector.h @@ -101,7 +101,7 @@ typedef Common::Array<const ADGameDescription *> ADGameDescList; * terminate a list to be passed to the AdvancedDetector API. */ #define AD_TABLE_END_MARKER \ - { NULL, NULL, { { NULL, 0, NULL, 0 } }, Common::UNK_LANG, Common::kPlatformUnknown, ADGF_NO_FLAGS, Common::GUIO_NONE } + { NULL, NULL, { { NULL, 0, NULL, 0 } }, Common::UNK_LANG, Common::kPlatformUnknown, ADGF_NO_FLAGS, GUIO1(GUIO_NONE) } struct ADFileBasedFallback { /** diff --git a/engines/agi/detection.cpp b/engines/agi/detection.cpp index 21b1831261..982dce8405 100644 --- a/engines/agi/detection.cpp +++ b/engines/agi/detection.cpp @@ -150,7 +150,7 @@ class AgiMetaEngine : public AdvancedMetaEngine { public: AgiMetaEngine() : AdvancedMetaEngine(Agi::gameDescriptions, sizeof(Agi::AGIGameDescription), agiGames) { _singleid = "agi"; - _guioptions = Common::GUIO_NOSPEECH; + _guioptions = GUIO1(GUIO_NOSPEECH); } virtual const char *getName() const { diff --git a/engines/agi/detection_tables.h b/engines/agi/detection_tables.h index f0cd422ed6..081cb39668 100644 --- a/engines/agi/detection_tables.h +++ b/engines/agi/detection_tables.h @@ -22,8 +22,6 @@ namespace Agi { -using Common::GUIO_NONE; - #define GAME_LVFPN(id,extra,fname,md5,size,lang,ver,features,gid,platform,interp) { \ { \ id, \ @@ -32,7 +30,7 @@ using Common::GUIO_NONE; lang, \ platform, \ ADGF_NO_FLAGS, \ - GUIO_NONE \ + GUIO1(GUIO_NONE) \ }, \ gid, \ interp, \ @@ -48,7 +46,7 @@ using Common::GUIO_NONE; lang, \ platform, \ ADGF_USEEXTRAASTITLE, \ - GUIO_NONE \ + GUIO1(GUIO_NONE) \ }, \ gid, \ interp, \ @@ -132,7 +130,7 @@ static const AGIGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_BC, GType_V1, @@ -153,7 +151,7 @@ static const AGIGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_BC, GType_V1, @@ -174,7 +172,7 @@ static const AGIGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_BC, GType_V1, @@ -254,7 +252,7 @@ static const AGIGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformMacintosh, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_GOLDRUSH, GType_V3, @@ -572,7 +570,7 @@ static const AGIGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformAmiga, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_SQ2, GType_V2, @@ -861,7 +859,7 @@ static const AGIGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_USEEXTRAASTITLE, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_FANMADE, GType_V3, @@ -889,7 +887,7 @@ static AGIGameDescription g_fallbackDesc = { Common::UNK_LANG, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_FANMADE, GType_V2, diff --git a/engines/agos/detection.cpp b/engines/agos/detection.cpp index 116e66820a..13559c2f4f 100644 --- a/engines/agos/detection.cpp +++ b/engines/agos/detection.cpp @@ -93,7 +93,7 @@ using namespace AGOS; class AgosMetaEngine : public AdvancedMetaEngine { public: AgosMetaEngine() : AdvancedMetaEngine(AGOS::gameDescriptions, sizeof(AGOS::AGOSGameDescription), agosGames) { - _guioptions = Common::GUIO_NOLAUNCHLOAD; + _guioptions = GUIO1(GUIO_NOLAUNCHLOAD); _maxScanDepth = 2; _directoryGlobs = directoryGlobs; } diff --git a/engines/agos/detection_tables.h b/engines/agos/detection_tables.h index a7a384a496..21b9d24c7c 100644 --- a/engines/agos/detection_tables.h +++ b/engines/agos/detection_tables.h @@ -22,12 +22,6 @@ namespace AGOS { -using Common::GUIO_NONE; -using Common::GUIO_NOMIDI; -using Common::GUIO_NOMUSIC; -using Common::GUIO_NOSPEECH; -using Common::GUIO_NOSUBTITLES; - static const AGOSGameDescription gameDescriptions[] = { // Personal Nightmare 1.1 - English Amiga { @@ -44,7 +38,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformAmiga, ADGF_NO_FLAGS, - GUIO_NOSPEECH | GUIO_NOMIDI + GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI) }, GType_PN, @@ -67,7 +61,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformAtariST, ADGF_DEMO, - GUIO_NOSPEECH | GUIO_NOMIDI + GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI) }, GType_PN, @@ -90,7 +84,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformAtariST, ADGF_NO_FLAGS, - GUIO_NOSPEECH | GUIO_NOMIDI + GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI) }, GType_PN, @@ -113,7 +107,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GType_PN, @@ -136,7 +130,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformAmiga, ADGF_DEMO, - GUIO_NOSPEECH | GUIO_NOMIDI + GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI) }, GType_ELVIRA1, @@ -157,7 +151,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformAmiga, ADGF_NO_FLAGS, - GUIO_NOSPEECH | GUIO_NOMIDI + GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI) }, GType_ELVIRA1, @@ -178,7 +172,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformAmiga, ADGF_NO_FLAGS, - GUIO_NOSPEECH | GUIO_NOMIDI + GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI) }, GType_ELVIRA1, @@ -199,7 +193,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformAmiga, ADGF_NO_FLAGS, - GUIO_NOSPEECH | GUIO_NOMIDI + GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI) }, GType_ELVIRA1, @@ -222,7 +216,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformAtariST, ADGF_DEMO, - GUIO_NOSPEECH | GUIO_NOMIDI + GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI) }, GType_ELVIRA1, @@ -245,7 +239,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformAtariST, ADGF_NO_FLAGS, - GUIO_NOSPEECH | GUIO_NOMIDI + GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI) }, GType_ELVIRA1, @@ -268,7 +262,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformAtariST, ADGF_NO_FLAGS, - GUIO_NOSPEECH | GUIO_NOMIDI + GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI) }, GType_ELVIRA1, @@ -291,7 +285,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GType_ELVIRA1, @@ -314,7 +308,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GType_ELVIRA1, @@ -337,7 +331,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::ES_ESP, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GType_ELVIRA1, @@ -360,7 +354,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GType_ELVIRA1, @@ -383,7 +377,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GType_ELVIRA1, @@ -409,7 +403,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformAmiga, ADGF_NO_FLAGS, - GUIO_NOSPEECH | GUIO_NOMIDI + GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI) }, GType_ELVIRA2, @@ -435,7 +429,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformAmiga, ADGF_NO_FLAGS, - GUIO_NOSPEECH | GUIO_NOMIDI + GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI) }, GType_ELVIRA2, @@ -461,7 +455,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformAmiga, ADGF_NO_FLAGS, - GUIO_NOSPEECH | GUIO_NOMIDI + GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI) }, GType_ELVIRA2, @@ -487,7 +481,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::IT_ITA, Common::kPlatformAmiga, ADGF_NO_FLAGS, - GUIO_NOSPEECH | GUIO_NOMIDI + GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI) }, GType_ELVIRA2, @@ -513,7 +507,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::ES_ESP, Common::kPlatformAmiga, ADGF_NO_FLAGS, - GUIO_NOSPEECH | GUIO_NOMIDI + GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI) }, GType_ELVIRA2, @@ -539,7 +533,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformAtariST, ADGF_NO_FLAGS, - GUIO_NOSPEECH | GUIO_NOMIDI + GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI) }, GType_ELVIRA2, @@ -565,7 +559,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformAtariST, ADGF_NO_FLAGS, - GUIO_NOSPEECH | GUIO_NOMIDI + GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI) }, GType_ELVIRA2, @@ -592,7 +586,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GType_ELVIRA2, @@ -618,7 +612,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GType_ELVIRA2, @@ -644,7 +638,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GType_ELVIRA2, @@ -670,7 +664,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GType_ELVIRA2, @@ -696,7 +690,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GType_ELVIRA2, @@ -722,7 +716,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::IT_ITA, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GType_ELVIRA2, @@ -748,7 +742,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::ES_ESP, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GType_ELVIRA2, @@ -774,7 +768,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::ES_ESP, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GType_ELVIRA2, @@ -801,7 +795,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformAmiga, ADGF_NO_FLAGS, - GUIO_NOSPEECH | GUIO_NOMIDI + GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI) }, GType_WW, @@ -828,7 +822,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformAmiga, ADGF_NO_FLAGS, - GUIO_NOSPEECH | GUIO_NOMIDI + GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI) }, GType_WW, @@ -851,7 +845,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GType_WW, @@ -880,7 +874,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GType_WW, @@ -909,7 +903,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GType_WW, @@ -938,7 +932,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GType_WW, @@ -967,7 +961,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::ES_ESP, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GType_WW, @@ -991,7 +985,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformAcorn, ADGF_NO_FLAGS, - GUIO_NOSPEECH | GUIO_NOMIDI + GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI) }, GType_SIMON1, @@ -1016,7 +1010,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformAcorn, ADGF_DEMO, - GUIO_NOSUBTITLES + GUIO1(GUIO_NOSUBTITLES) }, GType_SIMON1, @@ -1041,7 +1035,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformAcorn, ADGF_CD, - GUIO_NOSUBTITLES + GUIO1(GUIO_NOSUBTITLES) }, GType_SIMON1, @@ -1065,7 +1059,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformAmiga, ADGF_NO_FLAGS, - GUIO_NOSPEECH | GUIO_NOMIDI + GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI) }, GType_SIMON1, @@ -1089,7 +1083,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformAmiga, ADGF_DEMO, - GUIO_NOSPEECH | GUIO_NOMIDI + GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI) }, GType_SIMON1, @@ -1113,7 +1107,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformAmiga, ADGF_NO_FLAGS, - GUIO_NOSPEECH | GUIO_NOMIDI + GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI) }, GType_SIMON1, @@ -1137,7 +1131,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformAmiga, ADGF_NO_FLAGS, - GUIO_NOSPEECH | GUIO_NOMIDI + GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI) }, GType_SIMON1, @@ -1161,7 +1155,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformAmiga, ADGF_NO_FLAGS, - GUIO_NOSPEECH | GUIO_NOMIDI + GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI) }, GType_SIMON1, @@ -1185,7 +1179,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::IT_ITA, Common::kPlatformAmiga, ADGF_NO_FLAGS, - GUIO_NOSPEECH | GUIO_NOMIDI + GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI) }, GType_SIMON1, @@ -1209,7 +1203,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformAmiga, ADGF_CD, - GUIO_NOSUBTITLES | GUIO_NOMIDI + GUIO2(GUIO_NOSUBTITLES, GUIO_NOMIDI) }, GType_SIMON1, @@ -1233,7 +1227,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformAmiga, ADGF_CD, - GUIO_NOSUBTITLES | GUIO_NOMIDI + GUIO2(GUIO_NOSUBTITLES, GUIO_NOMIDI) }, GType_SIMON1, @@ -1257,7 +1251,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GType_SIMON1, @@ -1281,7 +1275,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GType_SIMON1, @@ -1305,7 +1299,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::CZ_CZE, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GType_SIMON1, @@ -1329,7 +1323,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::RU_RUS, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GType_SIMON1, @@ -1353,7 +1347,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GType_SIMON1, @@ -1377,7 +1371,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::CZ_CZE, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GType_SIMON1, @@ -1401,7 +1395,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::RU_RUS, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GType_SIMON1, @@ -1425,7 +1419,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GType_SIMON1, @@ -1449,7 +1443,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GType_SIMON1, @@ -1473,7 +1467,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::IT_ITA, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GType_SIMON1, @@ -1497,7 +1491,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::ES_ESP, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GType_SIMON1, @@ -1522,7 +1516,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, - GUIO_NOSUBTITLES + GUIO1(GUIO_NOSUBTITLES) }, GType_SIMON1, @@ -1547,7 +1541,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_CD, - GUIO_NOSUBTITLES + GUIO1(GUIO_NOSUBTITLES) }, GType_SIMON1, @@ -1572,7 +1566,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_CD, - GUIO_NOSUBTITLES + GUIO1(GUIO_NOSUBTITLES) }, GType_SIMON1, @@ -1597,7 +1591,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::RU_RUS, Common::kPlatformPC, ADGF_CD, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_SIMON1, @@ -1622,7 +1616,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformPC, ADGF_CD, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_SIMON1, @@ -1647,7 +1641,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES + GUIO1(GUIO_NOSUBTITLES) }, GType_SIMON1, @@ -1672,7 +1666,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::HE_ISR, Common::kPlatformPC, ADGF_CD, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_SIMON1, @@ -1697,7 +1691,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::IT_ITA, Common::kPlatformPC, ADGF_CD, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_SIMON1, @@ -1723,7 +1717,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::IT_ITA, Common::kPlatformWindows, ADGF_CD, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_SIMON1, @@ -1748,7 +1742,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::ES_ESP, Common::kPlatformPC, ADGF_CD, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_SIMON1, @@ -1773,7 +1767,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_CD, - GUIO_NOSUBTITLES + GUIO1(GUIO_NOSUBTITLES) }, GType_SIMON1, @@ -1798,7 +1792,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformWindows, ADGF_CD, - GUIO_NOSUBTITLES + GUIO1(GUIO_NOSUBTITLES) }, GType_SIMON1, @@ -1823,7 +1817,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GType_SIMON2, @@ -1848,7 +1842,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::RU_RUS, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GType_SIMON2, @@ -1873,7 +1867,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GType_SIMON2, @@ -1898,7 +1892,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GType_SIMON2, @@ -1923,7 +1917,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::IT_ITA, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GType_SIMON2, @@ -1948,7 +1942,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_SIMON2, @@ -1973,7 +1967,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_DEMO, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_SIMON2, @@ -1998,7 +1992,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_DEMO, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_SIMON2, @@ -2023,7 +2017,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_CD, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_SIMON2, @@ -2048,7 +2042,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_CD, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_SIMON2, @@ -2073,7 +2067,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformPC, ADGF_CD, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_SIMON2, @@ -2098,7 +2092,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_CD, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_SIMON2, @@ -2123,7 +2117,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_CD, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_SIMON2, @@ -2148,7 +2142,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::HE_ISR, Common::kPlatformPC, ADGF_CD, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_SIMON2, @@ -2174,7 +2168,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::IT_ITA, Common::kPlatformWindows, ADGF_CD, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_SIMON2, @@ -2199,7 +2193,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::ES_ESP, Common::kPlatformPC, ADGF_CD, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_SIMON2, @@ -2224,7 +2218,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::CZ_CZE, Common::kPlatformWindows, ADGF_CD, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_SIMON2, @@ -2249,7 +2243,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_CD, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_SIMON2, @@ -2274,7 +2268,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformWindows, ADGF_CD, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_SIMON2, @@ -2299,7 +2293,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformWindows, ADGF_CD, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_SIMON2, @@ -2324,7 +2318,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::PL_POL, Common::kPlatformWindows, ADGF_CD, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_SIMON2, @@ -2346,7 +2340,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, - GUIO_NOSUBTITLES | GUIO_NOMUSIC + GUIO2(GUIO_NOSUBTITLES, GUIO_NOMUSIC) }, GType_FF, @@ -2367,7 +2361,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_DEMO, - GUIO_NOSUBTITLES | GUIO_NOMUSIC + GUIO2(GUIO_NOSUBTITLES, GUIO_NOMUSIC) }, GType_FF, @@ -2391,7 +2385,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformAmiga, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOMUSIC + GUIO2(GUIO_NOSUBTITLES, GUIO_NOMUSIC) }, GType_FF, @@ -2415,7 +2409,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformAmiga, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOMUSIC + GUIO2(GUIO_NOSUBTITLES, GUIO_NOMUSIC) }, GType_FF, @@ -2439,7 +2433,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformMacintosh, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOMUSIC + GUIO2(GUIO_NOSUBTITLES, GUIO_NOMUSIC) }, GType_FF, @@ -2463,7 +2457,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformMacintosh, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOMUSIC + GUIO2(GUIO_NOSUBTITLES, GUIO_NOMUSIC) }, GType_FF, @@ -2487,7 +2481,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformMacintosh, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOMUSIC + GUIO2(GUIO_NOSUBTITLES, GUIO_NOMUSIC) }, GType_FF, @@ -2511,7 +2505,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::ES_ESP, Common::kPlatformMacintosh, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOMUSIC + GUIO2(GUIO_NOSUBTITLES, GUIO_NOMUSIC) }, GType_FF, @@ -2532,7 +2526,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOMUSIC + GUIO2(GUIO_NOSUBTITLES, GUIO_NOMUSIC) }, GType_FF, @@ -2555,7 +2549,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOMUSIC + GUIO2(GUIO_NOSUBTITLES, GUIO_NOMUSIC) }, GType_FF, @@ -2578,7 +2572,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::PL_POL, Common::kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOMUSIC + GUIO2(GUIO_NOSUBTITLES, GUIO_NOMUSIC) }, GType_FF, @@ -2599,7 +2593,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOMUSIC + GUIO2(GUIO_NOSUBTITLES, GUIO_NOMUSIC) }, GType_FF, @@ -2622,7 +2616,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOMUSIC + GUIO2(GUIO_NOSUBTITLES, GUIO_NOMUSIC) }, GType_FF, @@ -2645,7 +2639,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOMUSIC + GUIO2(GUIO_NOSUBTITLES, GUIO_NOMUSIC) }, GType_FF, @@ -2668,7 +2662,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOMUSIC + GUIO2(GUIO_NOSUBTITLES, GUIO_NOMUSIC) }, GType_FF, @@ -2691,7 +2685,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::IT_ITA, Common::kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOMUSIC + GUIO2(GUIO_NOSUBTITLES, GUIO_NOMUSIC) }, GType_FF, @@ -2714,7 +2708,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::PL_POL, Common::kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOMUSIC + GUIO2(GUIO_NOSUBTITLES, GUIO_NOMUSIC) }, GType_FF, @@ -2737,7 +2731,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::ES_ESP, Common::kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOMUSIC + GUIO2(GUIO_NOSUBTITLES, GUIO_NOMUSIC) }, GType_FF, @@ -2758,7 +2752,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOMUSIC + GUIO2(GUIO_NOSUBTITLES, GUIO_NOMUSIC) }, GType_PP, @@ -2779,7 +2773,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOMUSIC + GUIO2(GUIO_NOSUBTITLES, GUIO_NOMUSIC) }, GType_PP, @@ -2800,7 +2794,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES + GUIO1(GUIO_NOSUBTITLES) }, GType_PP, @@ -2821,7 +2815,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES + GUIO1(GUIO_NOSUBTITLES) }, GType_PP, @@ -2842,7 +2836,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES + GUIO1(GUIO_NOSUBTITLES) }, GType_PP, @@ -2863,7 +2857,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES + GUIO1(GUIO_NOSUBTITLES) }, GType_PP, @@ -2884,7 +2878,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES + GUIO1(GUIO_NOSUBTITLES) }, GType_PP, @@ -2905,7 +2899,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES + GUIO1(GUIO_NOSUBTITLES) }, GType_PP, @@ -2926,7 +2920,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES + GUIO1(GUIO_NOSUBTITLES) }, GType_PP, @@ -2947,7 +2941,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::PL_POL, Common::kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES + GUIO1(GUIO_NOSUBTITLES) }, GType_PP, @@ -2968,7 +2962,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::ES_ESP, Common::kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES + GUIO1(GUIO_NOSUBTITLES) }, GType_PP, diff --git a/engines/cge/detection.cpp b/engines/cge/detection.cpp index 8b90bd1483..f2f5764e54 100644 --- a/engines/cge/detection.cpp +++ b/engines/cge/detection.cpp @@ -35,8 +35,6 @@ static const PlainGameDescriptor CGEGames[] = { namespace CGE { -using Common::GUIO_NONE; - static const ADGameDescription gameDescriptions[] = { { @@ -46,7 +44,7 @@ static const ADGameDescription gameDescriptions[] = { {"vol.dat", 0, "f9ae2e7f8f7cac91378cdafca43faf1e", 8437572}, AD_LISTEND }, - Common::PL_POL, Common::kPlatformPC, ADGF_NO_FLAGS, GUIO_NONE + Common::PL_POL, Common::kPlatformPC, ADGF_NO_FLAGS, GUIO1(GUIO_NONE) }, { "soltys", "Soltys Freeware", @@ -55,7 +53,7 @@ static const ADGameDescription gameDescriptions[] = { {"vol.dat", 0, "f9ae2e7f8f7cac91378cdafca43faf1e", 8437676}, AD_LISTEND }, - Common::PL_POL, Common::kPlatformPC, ADGF_NO_FLAGS, GUIO_NONE + Common::PL_POL, Common::kPlatformPC, ADGF_NO_FLAGS, GUIO1(GUIO_NONE) }, // English ScummVM version { @@ -65,7 +63,7 @@ static const ADGameDescription gameDescriptions[] = { {"vol.dat", 0, "f9ae2e7f8f7cac91378cdafca43faf1e", 8428832}, AD_LISTEND }, - Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, GUIO_NONE + Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, GUIO1(GUIO_NONE) }, { "soltys", "Soltys Demo (not supported)", @@ -74,7 +72,7 @@ static const ADGameDescription gameDescriptions[] = { {"vol.dat", 0, "75d385a6074c58b69f7730481f256051", 1796710}, AD_LISTEND }, - Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO , GUIO_NONE + Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO , GUIO1(GUIO_NONE) }, { "soltys", "Soltys Demo (not supported)", @@ -83,7 +81,7 @@ static const ADGameDescription gameDescriptions[] = { {"vol.dat", 0, "c5d9b15863cab61dc125551576dece04", 1075272}, AD_LISTEND }, - Common::PL_POL, Common::kPlatformPC, ADGF_DEMO , GUIO_NONE + Common::PL_POL, Common::kPlatformPC, ADGF_DEMO , GUIO1(GUIO_NONE) }, AD_TABLE_END_MARKER }; diff --git a/engines/cine/detection.cpp b/engines/cine/detection.cpp index ba0251520b..a64272d967 100644 --- a/engines/cine/detection.cpp +++ b/engines/cine/detection.cpp @@ -65,7 +65,7 @@ class CineMetaEngine : public AdvancedMetaEngine { public: CineMetaEngine() : AdvancedMetaEngine(Cine::gameDescriptions, sizeof(Cine::CINEGameDescription), cineGames) { _singleid = "cine"; - _guioptions = Common::GUIO_NOSPEECH | Common::GUIO_NOMIDI; + _guioptions = GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI); } virtual GameDescriptor findGame(const char *gameid) const { diff --git a/engines/cine/detection_tables.h b/engines/cine/detection_tables.h index 4b293deb62..c8ab63edaf 100644 --- a/engines/cine/detection_tables.h +++ b/engines/cine/detection_tables.h @@ -22,8 +22,6 @@ namespace Cine { -using Common::GUIO_NONE; - static const CINEGameDescription gameDescriptions[] = { { { @@ -33,7 +31,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_FW, 0, @@ -53,7 +51,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::EN_USA, Common::kPlatformPC, ADGF_CD, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_FW, GF_CD | GF_CRYPTED_BOOT_PRC, @@ -68,7 +66,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_FW, 0, @@ -82,7 +80,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_FW, GF_ALT_FONT, @@ -96,7 +94,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::ES_ESP, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_FW, GF_ALT_FONT, @@ -110,7 +108,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_FW, 0, @@ -124,7 +122,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformAmiga, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_FW, 0, @@ -138,7 +136,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::EN_USA, Common::kPlatformAmiga, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_FW, 0, @@ -152,7 +150,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformAmiga, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_FW, GF_ALT_FONT, @@ -166,7 +164,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::ES_ESP, Common::kPlatformAmiga, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_FW, 0, @@ -180,7 +178,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformAmiga, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_FW, 0, @@ -194,7 +192,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::IT_ITA, Common::kPlatformAmiga, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_FW, 0, @@ -212,7 +210,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformAmiga, ADGF_DEMO, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_FW, 0, @@ -226,7 +224,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformAtariST, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_FW, 0, @@ -240,7 +238,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformAtariST, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_FW, 0, @@ -254,7 +252,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::EN_GRB, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_OS, 0, @@ -270,7 +268,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::EN_GRB, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_OS, 0, @@ -284,7 +282,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::EN_USA, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_OS, 0, @@ -298,7 +296,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::EN_USA, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_OS, GF_CD, @@ -312,7 +310,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_OS, 0, @@ -326,7 +324,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::ES_ESP, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_OS, 0, @@ -344,7 +342,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::ES_ESP, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_OS, GF_CD, @@ -358,7 +356,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_OS, 0, @@ -372,7 +370,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::IT_ITA, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_OS, 0, @@ -386,7 +384,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::EN_GRB, Common::kPlatformAmiga, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_OS, 0, @@ -400,7 +398,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::EN_GRB, Common::kPlatformAmiga, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_OS, 0, @@ -414,7 +412,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::EN_USA, Common::kPlatformAmiga, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_OS, 0, @@ -428,7 +426,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformAmiga, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_OS, 0, @@ -442,7 +440,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::ES_ESP, Common::kPlatformAmiga, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_OS, 0, @@ -456,7 +454,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformAmiga, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_OS, 0, @@ -470,7 +468,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::EN_GRB, Common::kPlatformAmiga, ADGF_DEMO, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_OS, GF_DEMO, @@ -484,7 +482,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::EN_GRB, Common::kPlatformAtariST, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_OS, 0, @@ -498,7 +496,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformAtariST, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_OS, 0, diff --git a/engines/composer/detection.cpp b/engines/composer/detection.cpp index 2ca00f9f53..eb4e820a13 100644 --- a/engines/composer/detection.cpp +++ b/engines/composer/detection.cpp @@ -63,8 +63,6 @@ static const PlainGameDescriptor composerGames[] = { namespace Composer { -using Common::GUIO_NONE; - static const ComposerGameDescription gameDescriptions[] = { // from Liam Finds a Story CD { @@ -75,7 +73,7 @@ static const ComposerGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_USEEXTRAASTITLE | ADGF_DEMO, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_ComposerV1 }, @@ -88,7 +86,7 @@ static const ComposerGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_ComposerV2 }, @@ -102,7 +100,7 @@ static const ComposerGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_USEEXTRAASTITLE | ADGF_DEMO, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_ComposerV2 }, @@ -119,7 +117,7 @@ static const ComposerGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_ComposerV2 }, @@ -132,7 +130,7 @@ static const ComposerGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformMacintosh, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_ComposerV2 }, @@ -145,7 +143,7 @@ static const ComposerGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_ComposerV2 }, @@ -162,7 +160,7 @@ static const ComposerGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_ComposerV2 }, @@ -175,7 +173,7 @@ static const ComposerGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformMacintosh, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_ComposerV2 }, @@ -188,7 +186,7 @@ static const ComposerGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_ComposerV2 }, @@ -205,7 +203,7 @@ static const ComposerGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_ComposerV2 }, @@ -222,7 +220,7 @@ static const ComposerGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_ComposerV2 }, diff --git a/engines/cruise/detection.cpp b/engines/cruise/detection.cpp index a68b14d986..a482e263a2 100644 --- a/engines/cruise/detection.cpp +++ b/engines/cruise/detection.cpp @@ -66,8 +66,6 @@ static const PlainGameDescriptor cruiseGames[] = { namespace Cruise { -using Common::GUIO_NONE; - static const CRUISEGameDescription gameDescriptions[] = { { { @@ -77,7 +75,7 @@ static const CRUISEGameDescription gameDescriptions[] = { Common::EN_GRB, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_CRUISE, 0, @@ -90,7 +88,7 @@ static const CRUISEGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_CRUISE, 0, @@ -103,7 +101,7 @@ static const CRUISEGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_CRUISE, 0, @@ -116,7 +114,7 @@ static const CRUISEGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_CRUISE, 0, @@ -129,7 +127,7 @@ static const CRUISEGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_CRUISE, 0, @@ -142,7 +140,7 @@ static const CRUISEGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_CRUISE, 0, @@ -155,7 +153,7 @@ static const CRUISEGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformAmiga, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_CRUISE, 0, @@ -168,7 +166,7 @@ static const CRUISEGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformAmiga, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_CRUISE, 0, @@ -181,7 +179,7 @@ static const CRUISEGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformAtariST, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_CRUISE, 0, @@ -194,7 +192,7 @@ static const CRUISEGameDescription gameDescriptions[] = { Common::IT_ITA, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_CRUISE, 0, @@ -207,7 +205,7 @@ static const CRUISEGameDescription gameDescriptions[] = { Common::ES_ESP, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_CRUISE, 0, @@ -221,7 +219,7 @@ class CruiseMetaEngine : public AdvancedMetaEngine { public: CruiseMetaEngine() : AdvancedMetaEngine(Cruise::gameDescriptions, sizeof(Cruise::CRUISEGameDescription), cruiseGames) { _singleid = "cruise"; - _guioptions = Common::GUIO_NOSPEECH | Common::GUIO_NOMIDI; + _guioptions = GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI); } virtual const char *getName() const { diff --git a/engines/draci/detection.cpp b/engines/draci/detection.cpp index e7fbaf62ef..e483e8ca9f 100644 --- a/engines/draci/detection.cpp +++ b/engines/draci/detection.cpp @@ -35,8 +35,6 @@ static const PlainGameDescriptor draciGames[] = { namespace Draci { -using Common::GUIO_NONE; - const ADGameDescription gameDescriptions[] = { { "draci", @@ -45,7 +43,7 @@ const ADGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, { @@ -55,7 +53,7 @@ const ADGameDescription gameDescriptions[] = { Common::CZ_CZE, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, { @@ -65,7 +63,7 @@ const ADGameDescription gameDescriptions[] = { Common::PL_POL, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, { @@ -75,7 +73,7 @@ const ADGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, AD_TABLE_END_MARKER diff --git a/engines/drascula/detection.cpp b/engines/drascula/detection.cpp index 6ba5597e8a..0969ad4131 100644 --- a/engines/drascula/detection.cpp +++ b/engines/drascula/detection.cpp @@ -63,8 +63,6 @@ static const PlainGameDescriptor drasculaGames[] = { namespace Drascula { -using Common::GUIO_NONE; - static const DrasculaGameDescription gameDescriptions[] = { { // Drascula English version @@ -75,7 +73,7 @@ static const DrasculaGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, }, @@ -95,7 +93,7 @@ static const DrasculaGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, GF_PACKED, - GUIO_NONE + GUIO1(GUIO_NONE) }, }, @@ -112,7 +110,7 @@ static const DrasculaGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, GF_PACKED, - GUIO_NONE + GUIO1(GUIO_NONE) }, }, @@ -129,7 +127,7 @@ static const DrasculaGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformPC, GF_PACKED, - GUIO_NONE + GUIO1(GUIO_NONE) }, }, @@ -142,7 +140,7 @@ static const DrasculaGameDescription gameDescriptions[] = { Common::ES_ESP, Common::kPlatformPC, GF_PACKED, - GUIO_NONE + GUIO1(GUIO_NONE) }, }, @@ -155,7 +153,7 @@ static const DrasculaGameDescription gameDescriptions[] = { Common::ES_ESP, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, }, @@ -168,7 +166,7 @@ static const DrasculaGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, }, @@ -181,7 +179,7 @@ static const DrasculaGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, }, @@ -194,7 +192,7 @@ static const DrasculaGameDescription gameDescriptions[] = { Common::IT_ITA, Common::kPlatformPC, GF_PACKED, - GUIO_NONE + GUIO1(GUIO_NONE) }, }, { @@ -206,7 +204,7 @@ static const DrasculaGameDescription gameDescriptions[] = { Common::IT_ITA, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, }, @@ -223,7 +221,7 @@ static const DrasculaGameDescription gameDescriptions[] = { Common::ES_ESP, Common::kPlatformPC, GF_PACKED, - GUIO_NONE + GUIO1(GUIO_NONE) }, }, @@ -240,7 +238,7 @@ static const DrasculaGameDescription gameDescriptions[] = { Common::IT_ITA, Common::kPlatformPC, GF_PACKED, - GUIO_NONE + GUIO1(GUIO_NONE) }, }, @@ -257,7 +255,7 @@ static const DrasculaGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformPC, GF_PACKED, - GUIO_NONE + GUIO1(GUIO_NONE) }, }, @@ -270,7 +268,7 @@ class DrasculaMetaEngine : public AdvancedMetaEngine { public: DrasculaMetaEngine() : AdvancedMetaEngine(Drascula::gameDescriptions, sizeof(Drascula::DrasculaGameDescription), drasculaGames) { _singleid = "drascula"; - _guioptions = Common::GUIO_NOMIDI | Common::GUIO_NOLAUNCHLOAD; + _guioptions = GUIO2(GUIO_NOMIDI, GUIO_NOLAUNCHLOAD); } virtual const char *getName() const { diff --git a/engines/dreamweb/detection.cpp b/engines/dreamweb/detection.cpp index 0ac61a3ac2..a3f311c304 100644 --- a/engines/dreamweb/detection.cpp +++ b/engines/dreamweb/detection.cpp @@ -40,7 +40,7 @@ public: AdvancedMetaEngine(DreamWeb::gameDescriptions, sizeof(DreamWeb::DreamWebGameDescription), dreamWebGames) { _singleid = "dreamweb"; - _guioptions = Common::GUIO_NOMIDI; + _guioptions = GUIO1(GUIO_NOMIDI); } virtual const char *getName() const { diff --git a/engines/dreamweb/detection_tables.h b/engines/dreamweb/detection_tables.h index 82fb6102e4..0902236916 100644 --- a/engines/dreamweb/detection_tables.h +++ b/engines/dreamweb/detection_tables.h @@ -25,8 +25,6 @@ namespace DreamWeb { -using Common::GUIO_NONE; - static const DreamWebGameDescription gameDescriptions[] = { // International floppy release { @@ -41,7 +39,7 @@ static const DreamWebGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, - GUIO_NONE + GUIO1(GUIO_NONE) }, }, @@ -58,7 +56,7 @@ static const DreamWebGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_CD | ADGF_UNSTABLE, - GUIO_NONE + GUIO1(GUIO_NONE) }, }, @@ -75,7 +73,7 @@ static const DreamWebGameDescription gameDescriptions[] = { Common::EN_USA, Common::kPlatformPC, ADGF_CD, - GUIO_NONE + GUIO1(GUIO_NONE) }, }, @@ -92,7 +90,7 @@ static const DreamWebGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformPC, ADGF_CD | ADGF_UNSTABLE, - GUIO_NONE + GUIO1(GUIO_NONE) }, }, @@ -109,7 +107,7 @@ static const DreamWebGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_UNSTABLE, - GUIO_NONE + GUIO1(GUIO_NONE) }, }, @@ -126,7 +124,7 @@ static const DreamWebGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_CD | ADGF_UNSTABLE, - GUIO_NONE + GUIO1(GUIO_NONE) }, }, @@ -143,7 +141,7 @@ static const DreamWebGameDescription gameDescriptions[] = { Common::ES_ESP, Common::kPlatformPC, ADGF_UNSTABLE, - GUIO_NONE + GUIO1(GUIO_NONE) }, }, @@ -160,7 +158,7 @@ static const DreamWebGameDescription gameDescriptions[] = { Common::ES_ESP, Common::kPlatformPC, ADGF_CD | ADGF_UNSTABLE, - GUIO_NONE + GUIO1(GUIO_NONE) }, }, @@ -177,7 +175,7 @@ static const DreamWebGameDescription gameDescriptions[] = { Common::IT_ITA, Common::kPlatformPC, ADGF_UNSTABLE, - GUIO_NONE + GUIO1(GUIO_NONE) }, }, diff --git a/engines/gob/detection.cpp b/engines/gob/detection.cpp index 9a554b5429..17a2ae3da8 100644 --- a/engines/gob/detection.cpp +++ b/engines/gob/detection.cpp @@ -91,7 +91,7 @@ class GobMetaEngine : public AdvancedMetaEngine { public: GobMetaEngine() : AdvancedMetaEngine(Gob::gameDescriptions, sizeof(Gob::GOBGameDescription), gobGames) { _singleid = "gob"; - _guioptions = Common::GUIO_NOLAUNCHLOAD; + _guioptions = GUIO1(GUIO_NOLAUNCHLOAD); } virtual GameDescriptor findGame(const char *gameid) const { diff --git a/engines/gob/detection_tables.h b/engines/gob/detection_tables.h index 9c13b4f7b8..636044975a 100644 --- a/engines/gob/detection_tables.h +++ b/engines/gob/detection_tables.h @@ -22,10 +22,6 @@ namespace Gob { -using Common::GUIO_NOSPEECH; -using Common::GUIO_NOSUBTITLES; -using Common::GUIO_NONE; - static const GOBGameDescription gameDescriptions[] = { { // Supplied by Florian Zeitz on scummvm-devel { @@ -35,7 +31,7 @@ static const GOBGameDescription gameDescriptions[] = { UNK_LANG, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob1, kFeaturesEGA, @@ -49,7 +45,7 @@ static const GOBGameDescription gameDescriptions[] = { RU_RUS, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob1, kFeaturesEGA, @@ -63,7 +59,7 @@ static const GOBGameDescription gameDescriptions[] = { UNK_LANG, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob1, kFeaturesNone, @@ -77,7 +73,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_GRB, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob1, kFeaturesAdLib, @@ -91,7 +87,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_ANY, kPlatformMacintosh, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob1, kFeaturesNone, @@ -105,7 +101,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_ANY, kPlatformMacintosh, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob1, kFeaturesAdLib, @@ -119,7 +115,7 @@ static const GOBGameDescription gameDescriptions[] = { DE_DEU, kPlatformMacintosh, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob1, kFeaturesAdLib, @@ -133,7 +129,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformMacintosh, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob1, kFeaturesAdLib, @@ -147,7 +143,7 @@ static const GOBGameDescription gameDescriptions[] = { IT_ITA, kPlatformMacintosh, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob1, kFeaturesAdLib, @@ -161,7 +157,7 @@ static const GOBGameDescription gameDescriptions[] = { ES_ESP, kPlatformMacintosh, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob1, kFeaturesAdLib, @@ -179,7 +175,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob1, kFeaturesAdLib, @@ -197,7 +193,7 @@ static const GOBGameDescription gameDescriptions[] = { IT_ITA, kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob1, kFeaturesAdLib, @@ -215,7 +211,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_GRB, kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob1, kFeaturesAdLib, @@ -233,7 +229,7 @@ static const GOBGameDescription gameDescriptions[] = { DE_DEU, kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob1, kFeaturesAdLib, @@ -251,7 +247,7 @@ static const GOBGameDescription gameDescriptions[] = { ES_ESP, kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob1, kFeaturesAdLib, @@ -269,7 +265,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_GRB, kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob1, kFeaturesAdLib, @@ -287,7 +283,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob1, kFeaturesAdLib, @@ -305,7 +301,7 @@ static const GOBGameDescription gameDescriptions[] = { ES_ESP, kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob1, kFeaturesAdLib, @@ -323,7 +319,7 @@ static const GOBGameDescription gameDescriptions[] = { IT_ITA, kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob1, kFeaturesAdLib, @@ -341,7 +337,7 @@ static const GOBGameDescription gameDescriptions[] = { DE_DEU, kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob1, kFeaturesAdLib, @@ -355,7 +351,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob1, kFeaturesAdLib, @@ -369,7 +365,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_GRB, kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob1, kFeaturesAdLib, @@ -383,7 +379,7 @@ static const GOBGameDescription gameDescriptions[] = { DE_DEU, kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob1, kFeaturesAdLib, @@ -397,7 +393,7 @@ static const GOBGameDescription gameDescriptions[] = { IT_ITA, kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob1, kFeaturesAdLib, @@ -411,7 +407,7 @@ static const GOBGameDescription gameDescriptions[] = { ES_ESP, kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob1, kFeaturesAdLib, @@ -425,7 +421,7 @@ static const GOBGameDescription gameDescriptions[] = { UNK_LANG, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob1, kFeaturesCD, @@ -439,7 +435,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_USA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob1, kFeaturesCD, @@ -453,7 +449,7 @@ static const GOBGameDescription gameDescriptions[] = { DE_DEU, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob1, kFeaturesCD, @@ -467,7 +463,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob1, kFeaturesCD, @@ -481,7 +477,7 @@ static const GOBGameDescription gameDescriptions[] = { IT_ITA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob1, kFeaturesCD, @@ -495,7 +491,7 @@ static const GOBGameDescription gameDescriptions[] = { ES_ESP, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob1, kFeaturesCD, @@ -509,7 +505,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_USA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob1, kFeaturesCD, @@ -523,7 +519,7 @@ static const GOBGameDescription gameDescriptions[] = { DE_DEU, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob1, kFeaturesCD, @@ -537,7 +533,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob1, kFeaturesCD, @@ -551,7 +547,7 @@ static const GOBGameDescription gameDescriptions[] = { IT_ITA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob1, kFeaturesCD, @@ -565,7 +561,7 @@ static const GOBGameDescription gameDescriptions[] = { ES_ESP, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob1, kFeaturesCD, @@ -579,7 +575,7 @@ static const GOBGameDescription gameDescriptions[] = { HU_HUN, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob1, kFeaturesCD, @@ -593,7 +589,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob1, kFeaturesCD, @@ -607,7 +603,7 @@ static const GOBGameDescription gameDescriptions[] = { ES_ESP, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob1, kFeaturesCD, @@ -621,7 +617,7 @@ static const GOBGameDescription gameDescriptions[] = { IT_ITA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob1, kFeaturesCD, @@ -635,7 +631,7 @@ static const GOBGameDescription gameDescriptions[] = { UNK_LANG, kPlatformAmiga, ADGF_DEMO, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob1, kFeaturesNone, @@ -649,7 +645,7 @@ static const GOBGameDescription gameDescriptions[] = { UNK_LANG, kPlatformPC, ADGF_DEMO, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob1, kFeaturesNone, @@ -663,7 +659,7 @@ static const GOBGameDescription gameDescriptions[] = { UNK_LANG, kPlatformPC, ADGF_DEMO, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob1, kFeaturesNone, @@ -677,7 +673,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_DEMO, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob1, kFeaturesNone, @@ -691,7 +687,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformCDi, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob1, kFeaturesAdLib, @@ -705,7 +701,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_ANY, kPlatformAmiga, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesNone, @@ -719,7 +715,7 @@ static const GOBGameDescription gameDescriptions[] = { DE_DEU, kPlatformAmiga, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesNone, @@ -733,7 +729,7 @@ static const GOBGameDescription gameDescriptions[] = { IT_ITA, kPlatformAmiga, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesNone, @@ -747,7 +743,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformAtariST, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesNone, @@ -765,7 +761,7 @@ static const GOBGameDescription gameDescriptions[] = { UNK_LANG, kPlatformMacintosh, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesAdLib, @@ -783,7 +779,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformMacintosh, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesAdLib, @@ -797,7 +793,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_GRB, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesAdLib, @@ -811,7 +807,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_USA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesAdLib, @@ -825,7 +821,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_USA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesAdLib, @@ -839,7 +835,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesAdLib, @@ -853,7 +849,7 @@ static const GOBGameDescription gameDescriptions[] = { DE_DEU, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesAdLib, @@ -867,7 +863,7 @@ static const GOBGameDescription gameDescriptions[] = { DE_DEU, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesAdLib, @@ -881,7 +877,7 @@ static const GOBGameDescription gameDescriptions[] = { IT_ITA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesAdLib, @@ -895,7 +891,7 @@ static const GOBGameDescription gameDescriptions[] = { RU_RUS, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesAdLib, @@ -909,7 +905,7 @@ static const GOBGameDescription gameDescriptions[] = { ES_ESP, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesAdLib, @@ -927,7 +923,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesAdLib, @@ -945,7 +941,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_USA, kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesAdLib, @@ -963,7 +959,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesAdLib, @@ -981,7 +977,7 @@ static const GOBGameDescription gameDescriptions[] = { DE_DEU, kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesAdLib, @@ -999,7 +995,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_USA, kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesAdLib, @@ -1017,7 +1013,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesAdLib, @@ -1031,7 +1027,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesAdLib, @@ -1045,7 +1041,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesAdLib, @@ -1059,7 +1055,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_USA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesCD, @@ -1073,7 +1069,7 @@ static const GOBGameDescription gameDescriptions[] = { UNK_LANG, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesCD, @@ -1087,7 +1083,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_ANY, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesCD, @@ -1101,7 +1097,7 @@ static const GOBGameDescription gameDescriptions[] = { DE_DEU, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesCD, @@ -1115,7 +1111,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesCD, @@ -1129,7 +1125,7 @@ static const GOBGameDescription gameDescriptions[] = { IT_ITA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesCD, @@ -1143,7 +1139,7 @@ static const GOBGameDescription gameDescriptions[] = { ES_ESP, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesCD, @@ -1157,7 +1153,7 @@ static const GOBGameDescription gameDescriptions[] = { HU_HUN, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesCD, @@ -1171,7 +1167,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesCD, @@ -1185,7 +1181,7 @@ static const GOBGameDescription gameDescriptions[] = { DE_DEU, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesCD, @@ -1199,7 +1195,7 @@ static const GOBGameDescription gameDescriptions[] = { ES_ESP, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesCD, @@ -1213,7 +1209,7 @@ static const GOBGameDescription gameDescriptions[] = { IT_ITA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesCD, @@ -1227,7 +1223,7 @@ static const GOBGameDescription gameDescriptions[] = { UNK_LANG, kPlatformPC, ADGF_DEMO, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesAdLib, @@ -1241,7 +1237,7 @@ static const GOBGameDescription gameDescriptions[] = { UNK_LANG, kPlatformPC, ADGF_DEMO, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesAdLib, @@ -1255,7 +1251,7 @@ static const GOBGameDescription gameDescriptions[] = { UNK_LANG, kPlatformAmiga, ADGF_DEMO, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesNone, @@ -1269,7 +1265,7 @@ static const GOBGameDescription gameDescriptions[] = { UNK_LANG, kPlatformAmiga, ADGF_DEMO, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesNone, @@ -1287,7 +1283,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_GRB, kPlatformAmiga, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeWeen, kFeaturesNone, @@ -1301,7 +1297,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformAmiga, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeWeen, kFeaturesNone, @@ -1315,7 +1311,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformAmiga, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeWeen, kFeaturesNone, @@ -1329,7 +1325,7 @@ static const GOBGameDescription gameDescriptions[] = { DE_DEU, kPlatformAmiga, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeWeen, kFeaturesNone, @@ -1347,7 +1343,7 @@ static const GOBGameDescription gameDescriptions[] = { IT_ITA, kPlatformAmiga, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeWeen, kFeaturesNone, @@ -1365,7 +1361,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_GRB, kPlatformAtariST, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeWeen, kFeaturesNone, @@ -1379,7 +1375,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformAtariST, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeWeen, kFeaturesNone, @@ -1393,7 +1389,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_GRB, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeWeen, kFeaturesAdLib, @@ -1407,7 +1403,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_USA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeWeen, kFeaturesAdLib, @@ -1421,7 +1417,7 @@ static const GOBGameDescription gameDescriptions[] = { ES_ESP, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeWeen, kFeaturesAdLib, @@ -1435,7 +1431,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeWeen, kFeaturesAdLib, @@ -1449,7 +1445,7 @@ static const GOBGameDescription gameDescriptions[] = { DE_DEU, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeWeen, kFeaturesAdLib, @@ -1463,7 +1459,7 @@ static const GOBGameDescription gameDescriptions[] = { IT_ITA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeWeen, kFeaturesAdLib, @@ -1477,7 +1473,7 @@ static const GOBGameDescription gameDescriptions[] = { UNK_LANG, kPlatformPC, ADGF_DEMO, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeWeen, kFeaturesAdLib, @@ -1491,7 +1487,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_USA, kPlatformPC, ADGF_DEMO, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeWeen, kFeaturesAdLib, @@ -1505,7 +1501,7 @@ static const GOBGameDescription gameDescriptions[] = { UNK_LANG, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeBargon, kFeaturesNone, @@ -1519,7 +1515,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformAtariST, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeBargon, kFeaturesNone, @@ -1533,7 +1529,7 @@ static const GOBGameDescription gameDescriptions[] = { ES_ESP, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeBargon, kFeaturesNone, @@ -1547,7 +1543,7 @@ static const GOBGameDescription gameDescriptions[] = { DE_DEU, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeBargon, kFeaturesNone, @@ -1561,7 +1557,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_ANY, kPlatformAmiga, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeBargon, kFeaturesNone, @@ -1575,7 +1571,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeBargon, kFeaturesNone, @@ -1589,7 +1585,7 @@ static const GOBGameDescription gameDescriptions[] = { IT_ITA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeBargon, kFeaturesNone, @@ -1603,7 +1599,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_GRB, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesAdLib | kFeaturesEGA, @@ -1617,7 +1613,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesAdLib | kFeaturesEGA, @@ -1631,7 +1627,7 @@ static const GOBGameDescription gameDescriptions[] = { DE_DEU, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesAdLib | kFeaturesEGA, @@ -1645,7 +1641,7 @@ static const GOBGameDescription gameDescriptions[] = { ES_ESP, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesAdLib | kFeaturesEGA, @@ -1659,7 +1655,7 @@ static const GOBGameDescription gameDescriptions[] = { IT_ITA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesAdLib | kFeaturesEGA, @@ -1677,7 +1673,7 @@ static const GOBGameDescription gameDescriptions[] = { UNK_LANG, kPlatformAmiga, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesNone, @@ -1691,7 +1687,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_GRB, kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesAdLib | kFeaturesEGA, @@ -1705,7 +1701,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesAdLib | kFeaturesEGA, @@ -1719,7 +1715,7 @@ static const GOBGameDescription gameDescriptions[] = { DE_DEU, kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesAdLib | kFeaturesEGA, @@ -1733,7 +1729,7 @@ static const GOBGameDescription gameDescriptions[] = { IT_ITA, kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesAdLib | kFeaturesEGA, @@ -1747,7 +1743,7 @@ static const GOBGameDescription gameDescriptions[] = { ES_ESP, kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesAdLib | kFeaturesEGA, @@ -1761,7 +1757,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesAdLib | kFeaturesEGA, @@ -1775,7 +1771,7 @@ static const GOBGameDescription gameDescriptions[] = { ES_ESP, kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesAdLib | kFeaturesEGA, @@ -1789,7 +1785,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_GRB, kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesAdLib | kFeaturesEGA, @@ -1803,7 +1799,7 @@ static const GOBGameDescription gameDescriptions[] = { IT_ITA, kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesAdLib | kFeaturesEGA, @@ -1817,7 +1813,7 @@ static const GOBGameDescription gameDescriptions[] = { DE_DEU, kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesAdLib | kFeaturesEGA, @@ -1833,7 +1829,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_PIRATED, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeLostInTime, kFeaturesAdLib, @@ -1847,7 +1843,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_USA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeLostInTime, kFeaturesAdLib, @@ -1861,7 +1857,7 @@ static const GOBGameDescription gameDescriptions[] = { HE_ISR, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeLostInTime, kFeaturesAdLib, @@ -1875,7 +1871,7 @@ static const GOBGameDescription gameDescriptions[] = { DE_DEU, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeLostInTime, kFeaturesAdLib, @@ -1889,7 +1885,7 @@ static const GOBGameDescription gameDescriptions[] = { ES_ESP, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeLostInTime, kFeaturesAdLib, @@ -1907,7 +1903,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformMacintosh, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeLostInTime, kFeaturesAdLib, @@ -1921,7 +1917,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_USA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeLostInTime, kFeaturesCD, @@ -1935,7 +1931,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeLostInTime, kFeaturesCD, @@ -1949,7 +1945,7 @@ static const GOBGameDescription gameDescriptions[] = { IT_ITA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeLostInTime, kFeaturesCD, @@ -1963,7 +1959,7 @@ static const GOBGameDescription gameDescriptions[] = { DE_DEU, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeLostInTime, kFeaturesCD, @@ -1977,7 +1973,7 @@ static const GOBGameDescription gameDescriptions[] = { ES_ESP, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeLostInTime, kFeaturesCD, @@ -1991,7 +1987,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_GRB, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeLostInTime, kFeaturesCD, @@ -2005,7 +2001,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_USA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeLostInTime, kFeaturesCD, @@ -2019,7 +2015,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeLostInTime, kFeaturesCD, @@ -2033,7 +2029,7 @@ static const GOBGameDescription gameDescriptions[] = { IT_ITA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeLostInTime, kFeaturesCD, @@ -2047,7 +2043,7 @@ static const GOBGameDescription gameDescriptions[] = { DE_DEU, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeLostInTime, kFeaturesCD, @@ -2061,7 +2057,7 @@ static const GOBGameDescription gameDescriptions[] = { ES_ESP, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeLostInTime, kFeaturesCD, @@ -2075,7 +2071,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_GRB, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeLostInTime, kFeaturesCD, @@ -2089,7 +2085,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_GRB, kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeLostInTime, kFeaturesAdLib, @@ -2103,7 +2099,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeLostInTime, kFeaturesAdLib, @@ -2117,7 +2113,7 @@ static const GOBGameDescription gameDescriptions[] = { ES_ESP, kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeLostInTime, kFeaturesAdLib, @@ -2131,7 +2127,7 @@ static const GOBGameDescription gameDescriptions[] = { DE_DEU, kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeLostInTime, kFeaturesAdLib, @@ -2145,7 +2141,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeLostInTime, kFeaturesAdLib, @@ -2159,7 +2155,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeLostInTime, kFeaturesAdLib, @@ -2177,7 +2173,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeLostInTime, kFeaturesAdLib, @@ -2195,7 +2191,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeLostInTime, kFeaturesAdLib, @@ -2209,7 +2205,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeLostInTime, kFeaturesAdLib, @@ -2227,7 +2223,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeLostInTime, kFeaturesAdLib, @@ -2241,7 +2237,7 @@ static const GOBGameDescription gameDescriptions[] = { UNK_LANG, kPlatformPC, ADGF_DEMO, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeLostInTime, kFeaturesAdLib, @@ -2255,7 +2251,7 @@ static const GOBGameDescription gameDescriptions[] = { UNK_LANG, kPlatformPC, ADGF_DEMO, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeLostInTime, kFeaturesAdLib, @@ -2269,7 +2265,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_ANY, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeFascination, kFeaturesAdLib, @@ -2283,7 +2279,7 @@ static const GOBGameDescription gameDescriptions[] = { IT_ITA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeFascination, kFeaturesAdLib, @@ -2297,7 +2293,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeFascination, kFeaturesAdLib, @@ -2311,7 +2307,7 @@ static const GOBGameDescription gameDescriptions[] = { HE_ISR, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeFascination, kFeaturesAdLib, @@ -2325,7 +2321,7 @@ static const GOBGameDescription gameDescriptions[] = { DE_DEU, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeFascination, kFeaturesAdLib, @@ -2339,7 +2335,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeFascination, kFeaturesAdLib, @@ -2353,7 +2349,7 @@ static const GOBGameDescription gameDescriptions[] = { DE_DEU, kPlatformAmiga, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeFascination, kFeaturesNone, @@ -2367,7 +2363,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_ANY, kPlatformAmiga, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeFascination, kFeaturesNone, @@ -2381,7 +2377,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformAmiga, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeFascination, kFeaturesNone, @@ -2395,7 +2391,7 @@ static const GOBGameDescription gameDescriptions[] = { IT_ITA, kPlatformAmiga, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeFascination, kFeaturesNone, @@ -2409,7 +2405,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_ANY, kPlatformAtariST, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeFascination, kFeaturesNone, @@ -2423,7 +2419,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_ANY, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES + GUIO1(GUIO_NOSUBTITLES) }, kGameTypeFascination, kFeaturesCD, @@ -2437,7 +2433,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES + GUIO1(GUIO_NOSUBTITLES) }, kGameTypeFascination, kFeaturesCD, @@ -2451,7 +2447,7 @@ static const GOBGameDescription gameDescriptions[] = { DE_DEU, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES + GUIO1(GUIO_NOSUBTITLES) }, kGameTypeFascination, kFeaturesCD, @@ -2465,7 +2461,7 @@ static const GOBGameDescription gameDescriptions[] = { IT_ITA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES + GUIO1(GUIO_NOSUBTITLES) }, kGameTypeFascination, kFeaturesCD, @@ -2479,7 +2475,7 @@ static const GOBGameDescription gameDescriptions[] = { ES_ESP, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES + GUIO1(GUIO_NOSUBTITLES) }, kGameTypeFascination, kFeaturesCD, @@ -2493,7 +2489,7 @@ static const GOBGameDescription gameDescriptions[] = { UNK_LANG, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGeisha, kFeaturesEGA | kFeaturesAdLib, @@ -2507,7 +2503,7 @@ static const GOBGameDescription gameDescriptions[] = { UNK_LANG, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGeisha, kFeaturesEGA | kFeaturesAdLib, @@ -2521,7 +2517,7 @@ static const GOBGameDescription gameDescriptions[] = { UNK_LANG, kPlatformAmiga, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGeisha, kFeaturesEGA, @@ -2535,7 +2531,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_GRB, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob3, kFeaturesAdLib, @@ -2549,7 +2545,7 @@ static const GOBGameDescription gameDescriptions[] = { HE_ISR, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob3, kFeaturesAdLib, @@ -2563,7 +2559,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_GRB, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob3, kFeaturesAdLib, @@ -2581,7 +2577,7 @@ static const GOBGameDescription gameDescriptions[] = { DE_DEU, kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob3, kFeaturesAdLib, @@ -2599,7 +2595,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob3, kFeaturesAdLib, @@ -2617,7 +2613,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_GRB, kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob3, kFeaturesAdLib, @@ -2635,7 +2631,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_GRB, kPlatformMacintosh, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob3, kFeaturesAdLib, @@ -2649,7 +2645,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_USA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob3, kFeaturesAdLib, @@ -2663,7 +2659,7 @@ static const GOBGameDescription gameDescriptions[] = { DE_DEU, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob3, kFeaturesAdLib, @@ -2677,7 +2673,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob3, kFeaturesAdLib, @@ -2691,7 +2687,7 @@ static const GOBGameDescription gameDescriptions[] = { IT_ITA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob3, kFeaturesAdLib, @@ -2705,7 +2701,7 @@ static const GOBGameDescription gameDescriptions[] = { RU_RUS, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob3, kFeaturesAdLib, @@ -2719,7 +2715,7 @@ static const GOBGameDescription gameDescriptions[] = { UNK_LANG, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob3, kFeaturesAdLib, @@ -2733,7 +2729,7 @@ static const GOBGameDescription gameDescriptions[] = { ES_ESP, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob3, kFeaturesAdLib, @@ -2747,7 +2743,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_GRB, kPlatformAmiga, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob3, kFeaturesNone, @@ -2761,7 +2757,7 @@ static const GOBGameDescription gameDescriptions[] = { DE_DEU, kPlatformAmiga, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob3, kFeaturesNone, @@ -2779,7 +2775,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob3, kFeaturesAdLib, @@ -2797,7 +2793,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob3, kFeaturesAdLib, @@ -2815,7 +2811,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_ANY, kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob3, kFeaturesAdLib, @@ -2829,7 +2825,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob3, kFeaturesAdLib, @@ -2843,7 +2839,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_USA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob3, kFeaturesCD, @@ -2857,7 +2853,7 @@ static const GOBGameDescription gameDescriptions[] = { UNK_LANG, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob3, kFeaturesCD, @@ -2871,7 +2867,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_ANY, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob3, kFeaturesCD, @@ -2885,7 +2881,7 @@ static const GOBGameDescription gameDescriptions[] = { DE_DEU, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob3, kFeaturesCD, @@ -2899,7 +2895,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob3, kFeaturesCD, @@ -2913,7 +2909,7 @@ static const GOBGameDescription gameDescriptions[] = { IT_ITA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob3, kFeaturesCD, @@ -2927,7 +2923,7 @@ static const GOBGameDescription gameDescriptions[] = { ES_ESP, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob3, kFeaturesCD, @@ -2941,7 +2937,7 @@ static const GOBGameDescription gameDescriptions[] = { HU_HUN, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob3, kFeaturesCD, @@ -2955,7 +2951,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob3, kFeaturesCD, @@ -2969,7 +2965,7 @@ static const GOBGameDescription gameDescriptions[] = { DE_DEU, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob3, kFeaturesCD, @@ -2983,7 +2979,7 @@ static const GOBGameDescription gameDescriptions[] = { ES_ESP, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob3, kFeaturesCD, @@ -2997,7 +2993,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_DEMO, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob3, kFeaturesAdLib, @@ -3011,7 +3007,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_DEMO, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob3, kFeaturesAdLib, @@ -3025,7 +3021,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_ANY, kPlatformPC, ADGF_DEMO, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob3, kFeaturesAdLib, @@ -3039,7 +3035,7 @@ static const GOBGameDescription gameDescriptions[] = { UNK_LANG, kPlatformPC, ADGF_DEMO, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob3, kFeaturesAdLib, @@ -3053,7 +3049,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_USA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeInca2, kFeaturesCD, @@ -3067,7 +3063,7 @@ static const GOBGameDescription gameDescriptions[] = { DE_DEU, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeInca2, kFeaturesCD, @@ -3081,7 +3077,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeInca2, kFeaturesCD, @@ -3095,7 +3091,7 @@ static const GOBGameDescription gameDescriptions[] = { IT_ITA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeInca2, kFeaturesCD, @@ -3109,7 +3105,7 @@ static const GOBGameDescription gameDescriptions[] = { ES_ESP, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeInca2, kFeaturesCD, @@ -3123,7 +3119,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_USA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeInca2, kFeaturesAdLib, @@ -3137,7 +3133,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeInca2, kFeaturesAdLib, @@ -3151,7 +3147,7 @@ static const GOBGameDescription gameDescriptions[] = { DE_DEU, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeInca2, kFeaturesAdLib, @@ -3165,7 +3161,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_USA, kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeInca2, kFeaturesAdLib, @@ -3179,7 +3175,7 @@ static const GOBGameDescription gameDescriptions[] = { DE_DEU, kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeInca2, kFeaturesAdLib, @@ -3193,7 +3189,7 @@ static const GOBGameDescription gameDescriptions[] = { IT_ITA, kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeInca2, kFeaturesAdLib, @@ -3207,7 +3203,7 @@ static const GOBGameDescription gameDescriptions[] = { ES_ESP, kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeInca2, kFeaturesAdLib, @@ -3221,7 +3217,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeInca2, kFeaturesAdLib, @@ -3248,7 +3244,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_ANY, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeInca2, kFeaturesAdLib | kFeaturesBATDemo, @@ -3262,7 +3258,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_GRB, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, kGameTypeWoodruff, kFeatures640x480, @@ -3276,7 +3272,7 @@ static const GOBGameDescription gameDescriptions[] = { DE_DEU, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, kGameTypeWoodruff, kFeatures640x480, @@ -3290,7 +3286,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, kGameTypeWoodruff, kFeatures640x480, @@ -3304,7 +3300,7 @@ static const GOBGameDescription gameDescriptions[] = { IT_ITA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, kGameTypeWoodruff, kFeatures640x480, @@ -3318,7 +3314,7 @@ static const GOBGameDescription gameDescriptions[] = { ES_ESP, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, kGameTypeWoodruff, kFeatures640x480, @@ -3332,7 +3328,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_GRB, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, kGameTypeWoodruff, kFeatures640x480, @@ -3346,7 +3342,7 @@ static const GOBGameDescription gameDescriptions[] = { DE_DEU, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, kGameTypeWoodruff, kFeatures640x480, @@ -3360,7 +3356,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, kGameTypeWoodruff, kFeatures640x480, @@ -3374,7 +3370,7 @@ static const GOBGameDescription gameDescriptions[] = { IT_ITA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, kGameTypeWoodruff, kFeatures640x480, @@ -3388,7 +3384,7 @@ static const GOBGameDescription gameDescriptions[] = { ES_ESP, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, kGameTypeWoodruff, kFeatures640x480, @@ -3402,7 +3398,7 @@ static const GOBGameDescription gameDescriptions[] = { DE_DEU, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, kGameTypeWoodruff, kFeatures640x480, @@ -3416,7 +3412,7 @@ static const GOBGameDescription gameDescriptions[] = { ES_ESP, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, kGameTypeWoodruff, kFeatures640x480, @@ -3430,7 +3426,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_GRB, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, kGameTypeWoodruff, kFeatures640x480, @@ -3444,7 +3440,7 @@ static const GOBGameDescription gameDescriptions[] = { DE_DEU, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, kGameTypeWoodruff, kFeatures640x480, @@ -3458,7 +3454,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, kGameTypeWoodruff, kFeatures640x480, @@ -3472,7 +3468,7 @@ static const GOBGameDescription gameDescriptions[] = { IT_ITA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, kGameTypeWoodruff, kFeatures640x480, @@ -3486,7 +3482,7 @@ static const GOBGameDescription gameDescriptions[] = { IT_ITA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, kGameTypeWoodruff, kFeatures640x480, @@ -3500,7 +3496,7 @@ static const GOBGameDescription gameDescriptions[] = { DE_DEU, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, kGameTypeWoodruff, kFeatures640x480, @@ -3514,7 +3510,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, kGameTypeWoodruff, kFeatures640x480, @@ -3528,7 +3524,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_GRB, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, kGameTypeWoodruff, kFeatures640x480, @@ -3542,7 +3538,7 @@ static const GOBGameDescription gameDescriptions[] = { DE_DEU, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, kGameTypeWoodruff, kFeatures640x480, @@ -3556,7 +3552,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, kGameTypeWoodruff, kFeatures640x480, @@ -3570,7 +3566,7 @@ static const GOBGameDescription gameDescriptions[] = { IT_ITA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, kGameTypeWoodruff, kFeatures640x480, @@ -3584,7 +3580,7 @@ static const GOBGameDescription gameDescriptions[] = { ES_ESP, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, kGameTypeWoodruff, kFeatures640x480, @@ -3598,7 +3594,7 @@ static const GOBGameDescription gameDescriptions[] = { PL_POL, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, kGameTypeWoodruff, kFeatures640x480, @@ -3616,7 +3612,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_ANY, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeWoodruff, kFeatures640x480 | kFeaturesSCNDemo, @@ -3630,7 +3626,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_USA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeDynasty, kFeatures640x480, @@ -3644,7 +3640,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_USA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeDynasty, kFeatures640x480, @@ -3658,7 +3654,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeDynasty, kFeatures640x480, @@ -3672,7 +3668,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeDynasty, kFeatures640x480, @@ -3686,7 +3682,7 @@ static const GOBGameDescription gameDescriptions[] = { DE_DEU, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeDynasty, kFeatures640x480, @@ -3700,7 +3696,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_USA, kPlatformPC, ADGF_DEMO, - GUIO_NONE + GUIO1(GUIO_NONE) }, kGameTypeDynasty, kFeatures640x480, @@ -3714,7 +3710,7 @@ static const GOBGameDescription gameDescriptions[] = { UNK_LANG, kPlatformWindows, ADGF_DEMO, - GUIO_NONE + GUIO1(GUIO_NONE) }, kGameTypeDynasty, kFeatures640x480, @@ -3728,7 +3724,7 @@ static const GOBGameDescription gameDescriptions[] = { DE_DEU, kPlatformWindows, ADGF_DEMO, - GUIO_NONE + GUIO1(GUIO_NONE) }, kGameTypeDynasty, kFeatures640x480, @@ -3742,7 +3738,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_USA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeUrban, kFeatures640x480 | kFeaturesTrueColor, @@ -3756,7 +3752,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_USA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeUrban, kFeatures640x480 | kFeaturesTrueColor, @@ -3770,7 +3766,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeUrban, kFeatures640x480 | kFeaturesTrueColor, @@ -3784,7 +3780,7 @@ static const GOBGameDescription gameDescriptions[] = { ES_ESP, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeUrban, kFeatures640x480 | kFeaturesTrueColor, @@ -3798,7 +3794,7 @@ static const GOBGameDescription gameDescriptions[] = { IT_ITA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeUrban, kFeatures640x480 | kFeaturesTrueColor, @@ -3812,7 +3808,7 @@ static const GOBGameDescription gameDescriptions[] = { IT_ITA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeUrban, kFeatures640x480 | kFeaturesTrueColor, @@ -3826,7 +3822,7 @@ static const GOBGameDescription gameDescriptions[] = { DE_DEU, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeUrban, kFeatures640x480 | kFeaturesTrueColor, @@ -3845,7 +3841,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_ANY, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, kGameTypeUrban, kFeatures640x480 | kFeaturesTrueColor | kFeaturesSCNDemo, @@ -3863,7 +3859,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypePlaytoons, kFeatures640x480, @@ -3881,7 +3877,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypePlaytoons, kFeatures640x480, @@ -3899,7 +3895,7 @@ static const GOBGameDescription gameDescriptions[] = { DE_DEU, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypePlaytoons, kFeatures640x480, @@ -3917,7 +3913,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_ANY, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypePlaytoons, kFeatures640x480, @@ -3940,7 +3936,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_ANY, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypePlaytoons, kFeatures640x480 | kFeaturesSCNDemo, @@ -3958,7 +3954,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_ANY, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypePlaytoons, kFeatures640x480 | kFeaturesSCNDemo, @@ -3980,7 +3976,7 @@ static const GOBGameDescription gameDescriptions[] = { IT_ITA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypePlaytoons, kFeatures640x480 | kFeaturesSCNDemo, @@ -4001,7 +3997,7 @@ static const GOBGameDescription gameDescriptions[] = { ES_ESP, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypePlaytoons, kFeatures640x480 | kFeaturesSCNDemo, @@ -4019,7 +4015,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_ANY, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypePlaytoons, kFeatures640x480, @@ -4037,7 +4033,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypePlaytoons, kFeatures640x480, @@ -4055,7 +4051,7 @@ static const GOBGameDescription gameDescriptions[] = { DE_DEU, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypePlaytoons, kFeatures640x480, @@ -4073,7 +4069,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_ANY, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypePlaytoons, kFeatures640x480, @@ -4091,7 +4087,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypePlaytoons, kFeatures640x480, @@ -4109,7 +4105,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_ANY, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypePlaytoons, kFeatures640x480, @@ -4127,7 +4123,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypePlaytoons, kFeatures640x480, @@ -4145,7 +4141,7 @@ static const GOBGameDescription gameDescriptions[] = { DE_DEU, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypePlaytoons, kFeatures640x480, @@ -4163,7 +4159,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_ANY, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypePlaytoons, kFeatures640x480, @@ -4181,7 +4177,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypePlaytoons, kFeatures640x480, @@ -4199,7 +4195,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_ANY, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypePlaytoons, kFeatures640x480, @@ -4217,7 +4213,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypePlaytoons, kFeatures640x480, @@ -4235,7 +4231,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeBambou, kFeatures640x480, @@ -4253,7 +4249,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypePlaytoons, kFeatures640x480, @@ -4271,7 +4267,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypePlaytoons, kFeatures640x480, @@ -4289,7 +4285,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypePlaytoons, kFeatures640x480, @@ -4303,7 +4299,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, kGameTypeAdi2, kFeaturesNone, @@ -4317,7 +4313,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, kGameTypeAdi2, kFeatures640x480, @@ -4331,7 +4327,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, kGameTypeAdi2, kFeatures640x480, @@ -4345,7 +4341,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_ANY, kPlatformAmiga, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, kGameTypeAdi2, kFeaturesNone, @@ -4359,7 +4355,7 @@ static const GOBGameDescription gameDescriptions[] = { ES_ESP, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, kGameTypeAdi2, kFeatures640x480, @@ -4373,7 +4369,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, kGameTypeAdi2, kFeatures640x480, @@ -4387,7 +4383,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, kGameTypeAdi2, kFeatures640x480, @@ -4401,7 +4397,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, kGameTypeAdi2, kFeatures640x480, @@ -4415,7 +4411,7 @@ static const GOBGameDescription gameDescriptions[] = { DE_DEU, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, kGameTypeAdi2, kFeatures640x480, @@ -4429,7 +4425,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, kGameTypeAdi2, kFeatures640x480, @@ -4449,7 +4445,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_ANY, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeAdi2, kFeatures640x480 | kFeaturesSCNDemo, @@ -4463,7 +4459,7 @@ static const GOBGameDescription gameDescriptions[] = { DE_DEU, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, kGameTypeAdi4, kFeatures640x480, @@ -4477,7 +4473,7 @@ static const GOBGameDescription gameDescriptions[] = { DE_DEU, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, kGameTypeAdi4, kFeatures640x480, @@ -4491,7 +4487,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, kGameTypeAdi4, kFeatures640x480, @@ -4505,7 +4501,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, kGameTypeAdi4, kFeatures640x480, @@ -4519,7 +4515,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, kGameTypeAdi4, kFeatures640x480, @@ -4533,7 +4529,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, kGameTypeAdi4, kFeatures640x480, @@ -4547,7 +4543,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_GRB, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, kGameTypeAdi4, kFeaturesNone, @@ -4561,7 +4557,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, kGameTypeAdi4, kFeaturesNone, @@ -4575,7 +4571,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, kGameTypeAdi4, kFeaturesNone, @@ -4589,7 +4585,7 @@ static const GOBGameDescription gameDescriptions[] = { DE_DEU, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, kGameTypeAdi4, kFeatures640x480, @@ -4603,7 +4599,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, kGameTypeAdi4, kFeaturesNone, @@ -4617,7 +4613,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, kGameTypeAdi4, kFeatures640x480, @@ -4631,7 +4627,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_DEMO, - GUIO_NONE + GUIO1(GUIO_NONE) }, kGameTypeAdi4, kFeatures640x480, @@ -4645,7 +4641,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_ANY, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesAdLib, @@ -4659,7 +4655,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeAdibou1, kFeaturesAdLib, @@ -4673,7 +4669,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, kGameTypeAdibou2, kFeaturesNone, @@ -4687,7 +4683,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, kGameTypeAdibou2, kFeaturesNone, @@ -4701,7 +4697,7 @@ static const GOBGameDescription gameDescriptions[] = { DE_DEU, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, kGameTypeAdibou2, kFeaturesNone, @@ -4715,7 +4711,7 @@ static const GOBGameDescription gameDescriptions[] = { IT_ITA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, kGameTypeAdibou2, kFeaturesNone, @@ -4729,7 +4725,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, kGameTypeAdibou2, kFeaturesNone, @@ -4743,7 +4739,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, kGameTypeAdibou2, kFeaturesNone, @@ -4757,7 +4753,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, kGameTypeAdibou2, kFeaturesNone, @@ -4771,7 +4767,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, kGameTypeAdibou2, kFeaturesNone, @@ -4785,7 +4781,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, kGameTypeAdibou2, kFeaturesNone, @@ -4799,7 +4795,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, kGameTypeAdibou2, kFeaturesNone, @@ -4817,7 +4813,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_GRB, kPlatformPC, ADGF_DEMO, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeAdibou2, kFeatures640x480 | kFeaturesSCNDemo, @@ -4835,7 +4831,7 @@ static const GOBGameDescription gameDescriptions[] = { DE_DEU, kPlatformPC, ADGF_DEMO, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeAdibou2, kFeatures640x480 | kFeaturesSCNDemo, @@ -4853,7 +4849,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_DEMO, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeAdibou2, kFeatures640x480 | kFeaturesSCNDemo, @@ -4871,7 +4867,7 @@ static const GOBGameDescription fallbackDescs[] = { UNK_LANG, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob1, kFeaturesNone, @@ -4885,7 +4881,7 @@ static const GOBGameDescription fallbackDescs[] = { UNK_LANG, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob1, kFeaturesCD, @@ -4899,7 +4895,7 @@ static const GOBGameDescription fallbackDescs[] = { UNK_LANG, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesAdLib, @@ -4913,7 +4909,7 @@ static const GOBGameDescription fallbackDescs[] = { UNK_LANG, kPlatformMacintosh, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesAdLib, @@ -4927,7 +4923,7 @@ static const GOBGameDescription fallbackDescs[] = { UNK_LANG, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob2, kFeaturesCD, @@ -4941,7 +4937,7 @@ static const GOBGameDescription fallbackDescs[] = { UNK_LANG, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeBargon, kFeaturesNone, @@ -4955,7 +4951,7 @@ static const GOBGameDescription fallbackDescs[] = { UNK_LANG, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob3, kFeaturesAdLib, @@ -4969,7 +4965,7 @@ static const GOBGameDescription fallbackDescs[] = { UNK_LANG, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGob3, kFeaturesCD, @@ -4983,7 +4979,7 @@ static const GOBGameDescription fallbackDescs[] = { UNK_LANG, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeWoodruff, kFeatures640x480, @@ -4997,7 +4993,7 @@ static const GOBGameDescription fallbackDescs[] = { UNK_LANG, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeLostInTime, kFeaturesAdLib, @@ -5011,7 +5007,7 @@ static const GOBGameDescription fallbackDescs[] = { UNK_LANG, kPlatformMacintosh, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeLostInTime, kFeaturesAdLib, @@ -5025,7 +5021,7 @@ static const GOBGameDescription fallbackDescs[] = { UNK_LANG, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeLostInTime, kFeaturesCD, @@ -5039,7 +5035,7 @@ static const GOBGameDescription fallbackDescs[] = { UNK_LANG, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeUrban, kFeatures640x480 | kFeaturesTrueColor, @@ -5053,7 +5049,7 @@ static const GOBGameDescription fallbackDescs[] = { UNK_LANG, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypePlaytoons, kFeatures640x480, @@ -5067,7 +5063,7 @@ static const GOBGameDescription fallbackDescs[] = { UNK_LANG, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypePlaytoons, kFeatures640x480, @@ -5081,7 +5077,7 @@ static const GOBGameDescription fallbackDescs[] = { UNK_LANG, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypePlaytoons, kFeatures640x480, @@ -5095,7 +5091,7 @@ static const GOBGameDescription fallbackDescs[] = { UNK_LANG, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypePlaytoons, kFeatures640x480, @@ -5109,7 +5105,7 @@ static const GOBGameDescription fallbackDescs[] = { UNK_LANG, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypePlaytoons, kFeatures640x480, @@ -5123,7 +5119,7 @@ static const GOBGameDescription fallbackDescs[] = { UNK_LANG, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypePlaytoons, kFeatures640x480, @@ -5137,7 +5133,7 @@ static const GOBGameDescription fallbackDescs[] = { UNK_LANG, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeBambou, kFeatures640x480, @@ -5151,7 +5147,7 @@ static const GOBGameDescription fallbackDescs[] = { UNK_LANG, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeFascination, kFeaturesNone, @@ -5165,7 +5161,7 @@ static const GOBGameDescription fallbackDescs[] = { UNK_LANG, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeGeisha, kFeaturesEGA, @@ -5179,7 +5175,7 @@ static const GOBGameDescription fallbackDescs[] = { UNK_LANG, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeAdi2, kFeatures640x480, @@ -5193,7 +5189,7 @@ static const GOBGameDescription fallbackDescs[] = { UNK_LANG, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSUBTITLES | GUIO_NOSPEECH + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) }, kGameTypeAdi4, kFeatures640x480, @@ -5207,7 +5203,7 @@ static const GOBGameDescription fallbackDescs[] = { UNK_LANG, kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, kGameTypeUrban, kFeaturesAdLib | kFeatures640x480 | kFeaturesSCNDemo, diff --git a/engines/groovie/detection.cpp b/engines/groovie/detection.cpp index 62887bac1e..f8414ac455 100644 --- a/engines/groovie/detection.cpp +++ b/engines/groovie/detection.cpp @@ -52,7 +52,7 @@ static const GroovieGameDescription gameDescriptions[] = { "t7g", "", AD_ENTRY1s("script.grv", "d1b8033b40aa67c076039881eccce90d", 16659), Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, - Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM + GUIO3(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM) }, kGroovieT7G, 0 }, @@ -63,7 +63,7 @@ static const GroovieGameDescription gameDescriptions[] = { "t7g", "", AD_ENTRY1s("T7GMac", "acdc4a58dd3f007f65e99b99d78e0bce", 1814029), Common::EN_ANY, Common::kPlatformMacintosh, ADGF_MACRESFORK, - Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM + GUIO3(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM) }, kGroovieT7G, 0 }, @@ -79,7 +79,7 @@ static const GroovieGameDescription gameDescriptions[] = { "t7g", "", AD_ENTRY1s("T7GMac", "6bdee8d0f9eef6d58d02fcd7deec3fb2", 1830783), Common::EN_ANY, Common::kPlatformMacintosh, ADGF_MACRESFORK, - Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM + GUIO3(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM) }, kGroovieT7G, 0 }, @@ -90,7 +90,7 @@ static const GroovieGameDescription gameDescriptions[] = { "t7g", "", AD_ENTRY1s("T7GMac", "0d595d4b44ae1814082938d051e5174e", 1830783), Common::EN_ANY, Common::kPlatformMacintosh, ADGF_MACRESFORK, - Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM + GUIO3(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM) }, kGroovieT7G, 0 }, @@ -106,7 +106,7 @@ static const GroovieGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::RU_RUS, Common::kPlatformPC, ADGF_NO_FLAGS, - Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM + GUIO3(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM) }, kGroovieT7G, 0 }, @@ -120,7 +120,7 @@ static const GroovieGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::EN_ANY, Common::kPlatformIOS, ADGF_NO_FLAGS, - Common::GUIO_NOMIDI + GUIO1(GUIO_NOMIDI) }, kGroovieT7G, 0 }, @@ -132,7 +132,7 @@ static const GroovieGameDescription gameDescriptions[] = { "11h", "", AD_ENTRY1s("disk.1", "5c0428cd3659fc7bbcd0aa16485ed5da", 227), Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, - Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM + GUIO3(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM) }, kGroovieV2, 1 }, @@ -142,8 +142,8 @@ static const GroovieGameDescription gameDescriptions[] = { { "11h", "Demo", AD_ENTRY1s("disk.1", "aacb32ce07e0df2894bd83a3dee40c12", 70), - Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO | ADGF_UNSTABLE, Common::GUIO_NOLAUNCHLOAD | - Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM + Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO | ADGF_UNSTABLE, + GUIO4(GUIO_NOLAUNCHLOAD, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM) }, kGroovieV2, 1 }, @@ -153,7 +153,7 @@ static const GroovieGameDescription gameDescriptions[] = { { "11h", "Making Of", AD_ENTRY1s("disk.1", "5c0428cd3659fc7bbcd0aa16485ed5da", 227), - Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, Common::GUIO_NOMIDI | Common::GUIO_NOLAUNCHLOAD + Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, GUIO2(GUIO_NOMIDI, GUIO_NOLAUNCHLOAD) }, kGroovieV2, 2 }, @@ -163,7 +163,7 @@ static const GroovieGameDescription gameDescriptions[] = { { "clandestiny", "Trailer", AD_ENTRY1s("disk.1", "5c0428cd3659fc7bbcd0aa16485ed5da", 227), - Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, Common::GUIO_NOMIDI | Common::GUIO_NOLAUNCHLOAD + Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, GUIO2(GUIO_NOMIDI, GUIO_NOLAUNCHLOAD) }, kGroovieV2, 3 }, @@ -173,7 +173,7 @@ static const GroovieGameDescription gameDescriptions[] = { { "clandestiny", "", AD_ENTRY1s("disk.1", "f79fc1515174540fef6a34132efc4c53", 76), - Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, Common::GUIO_NOMIDI + Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, GUIO1(GUIO_NOMIDI) }, kGroovieV2, 1 }, @@ -183,7 +183,7 @@ static const GroovieGameDescription gameDescriptions[] = { { "unclehenry", "", AD_ENTRY1s("disk.1", "0e1b1d3cecc4fc7efa62a968844d1f7a", 72), - Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, Common::GUIO_NOMIDI + Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, GUIO1(GUIO_NOMIDI) }, kGroovieV2, 1 }, @@ -193,7 +193,7 @@ static const GroovieGameDescription gameDescriptions[] = { { "tlc", "", AD_ENTRY1s("disk.1", "32a1afa68478f1f9d2b25eeea427f2e3", 84), - Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, Common::GUIO_NOMIDI + Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, GUIO1(GUIO_NOMIDI) }, kGroovieV2, 1 }, @@ -216,7 +216,7 @@ public: // to the detection entries. In the latter case, this TODO should be // replaced with an according explanation. _flags = kADFlagUseExtraAsHint; - _guioptions = Common::GUIO_NOSUBTITLES | Common::GUIO_NOSFX; + _guioptions = GUIO2(GUIO_NOSUBTITLES, GUIO_NOSFX); } const char *getName() const { diff --git a/engines/hugo/detection.cpp b/engines/hugo/detection.cpp index 5d972f5658..43e688bba4 100644 --- a/engines/hugo/detection.cpp +++ b/engines/hugo/detection.cpp @@ -63,7 +63,7 @@ static const HugoGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, kGameTypeHugo1 }, @@ -75,7 +75,7 @@ static const HugoGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, GF_PACKED, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, kGameTypeHugo1 }, @@ -87,7 +87,7 @@ static const HugoGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, GF_PACKED, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, kGameTypeHugo2 }, @@ -99,7 +99,7 @@ static const HugoGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, GF_PACKED, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, kGameTypeHugo2 }, @@ -111,7 +111,7 @@ static const HugoGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, GF_PACKED, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, kGameTypeHugo3 }, @@ -123,7 +123,7 @@ static const HugoGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, GF_PACKED, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, kGameTypeHugo3 }, diff --git a/engines/kyra/detection_tables.h b/engines/kyra/detection_tables.h index c224c8f46d..5c1e9df408 100644 --- a/engines/kyra/detection_tables.h +++ b/engines/kyra/detection_tables.h @@ -67,7 +67,7 @@ const KYRAGameDescription adGameDescs[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, - Common::GUIO_NOSPEECH | Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIPCSPK + GUIO4(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIPCSPK) }, KYRA1_FLOPPY_CMP_FLAGS }, @@ -80,7 +80,7 @@ const KYRAGameDescription adGameDescs[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_NO_FLAGS, - Common::GUIO_NOSPEECH | Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIPCSPK + GUIO4(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIPCSPK) }, KYRA1_FLOPPY_CMP_FLAGS }, @@ -94,7 +94,7 @@ const KYRAGameDescription adGameDescs[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, - Common::GUIO_NOSPEECH | Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIPCSPK + GUIO4(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIPCSPK) }, KYRA1_FLOPPY_FLAGS }, @@ -107,7 +107,7 @@ const KYRAGameDescription adGameDescs[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, - Common::GUIO_NOSPEECH | Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIPCSPK + GUIO4(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIPCSPK) }, KYRA1_FLOPPY_FLAGS }, @@ -119,7 +119,7 @@ const KYRAGameDescription adGameDescs[] = { Common::FR_FRA, Common::kPlatformPC, ADGF_NO_FLAGS, - Common::GUIO_NOSPEECH | Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIPCSPK + GUIO4(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIPCSPK) }, KYRA1_FLOPPY_FLAGS }, @@ -131,7 +131,7 @@ const KYRAGameDescription adGameDescs[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_NO_FLAGS, - Common::GUIO_NOSPEECH | Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIPCSPK + GUIO4(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIPCSPK) }, KYRA1_FLOPPY_FLAGS }, @@ -143,7 +143,7 @@ const KYRAGameDescription adGameDescs[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_NO_FLAGS, - Common::GUIO_NOSPEECH | Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIPCSPK + GUIO4(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIPCSPK) }, KYRA1_FLOPPY_FLAGS }, @@ -155,7 +155,7 @@ const KYRAGameDescription adGameDescs[] = { Common::RU_RUS, Common::kPlatformPC, ADGF_NO_FLAGS, - Common::GUIO_NOSPEECH | Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIPCSPK + GUIO4(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIPCSPK) }, KYRA1_OLDFLOPPY_FLAGS }, @@ -167,7 +167,7 @@ const KYRAGameDescription adGameDescs[] = { Common::ES_ESP, Common::kPlatformPC, ADGF_NO_FLAGS, - Common::GUIO_NOSPEECH | Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIPCSPK + GUIO4(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIPCSPK) }, KYRA1_FLOPPY_FLAGS }, @@ -179,7 +179,7 @@ const KYRAGameDescription adGameDescs[] = { Common::ES_ESP, Common::kPlatformPC, ADGF_NO_FLAGS, - Common::GUIO_NOSPEECH | Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIPCSPK + GUIO4(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIPCSPK) }, KYRA1_FLOPPY_FLAGS }, @@ -191,7 +191,7 @@ const KYRAGameDescription adGameDescs[] = { Common::IT_ITA, Common::kPlatformPC, ADGF_NO_FLAGS, - Common::GUIO_NOSPEECH | Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIPCSPK + GUIO4(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIPCSPK) }, KYRA1_FLOPPY_FLAGS }, @@ -208,7 +208,7 @@ const KYRAGameDescription adGameDescs[] = { Common::EN_ANY, Common::kPlatformAmiga, ADGF_NO_FLAGS, - Common::GUIO_NOSPEECH | Common::GUIO_MIDIAMIGA + GUIO2(GUIO_NOSPEECH, GUIO_MIDIAMIGA) }, KYRA1_AMIGA_FLAGS }, @@ -225,7 +225,7 @@ const KYRAGameDescription adGameDescs[] = { Common::DE_DEU, Common::kPlatformAmiga, ADGF_NO_FLAGS, - Common::GUIO_NOSPEECH | Common::GUIO_MIDIAMIGA + GUIO2(GUIO_NOSPEECH, GUIO_MIDIAMIGA) }, KYRA1_AMIGA_FLAGS }, @@ -242,7 +242,7 @@ const KYRAGameDescription adGameDescs[] = { Common::EN_ANY, Common::kPlatformMacintosh, ADGF_NO_FLAGS, - Common::GUIO_NOSPEECH | Common::GUIO_MIDIGM + GUIO2(GUIO_NOSPEECH, GUIO_MIDIGM) }, KYRA1_FLOPPY_FLAGS }, @@ -259,7 +259,7 @@ const KYRAGameDescription adGameDescs[] = { Common::EN_ANY, Common::kPlatformFMTowns, ADGF_NO_FLAGS, - Common::GUIO_NOSPEECH | Common::GUIO_MIDITOWNS + GUIO2(GUIO_NOSPEECH, GUIO_MIDITOWNS) }, KYRA1_TOWNS_FLAGS }, @@ -275,7 +275,7 @@ const KYRAGameDescription adGameDescs[] = { Common::JA_JPN, Common::kPlatformFMTowns, ADGF_NO_FLAGS, - Common::GUIO_NOSPEECH | Common::GUIO_MIDITOWNS + GUIO2(GUIO_NOSPEECH, GUIO_MIDITOWNS) }, KYRA1_TOWNS_SJIS_FLAGS }, @@ -294,7 +294,7 @@ const KYRAGameDescription adGameDescs[] = { Common::JA_JPN, Common::kPlatformPC98, ADGF_NO_FLAGS, - Common::GUIO_NOSPEECH | Common::GUIO_MIDIPC98 + GUIO2(GUIO_NOSPEECH, GUIO_MIDIPC98) }, KYRA1_TOWNS_SJIS_FLAGS }, @@ -307,7 +307,7 @@ const KYRAGameDescription adGameDescs[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_CD, - Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIPCSPK + GUIO3(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIPCSPK) }, KYRA1_CD_FLAGS }, @@ -319,7 +319,7 @@ const KYRAGameDescription adGameDescs[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_CD, - Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIPCSPK + GUIO3(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIPCSPK) }, KYRA1_CD_FLAGS }, @@ -331,7 +331,7 @@ const KYRAGameDescription adGameDescs[] = { Common::FR_FRA, Common::kPlatformPC, ADGF_CD, - Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIPCSPK + GUIO3(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIPCSPK) }, KYRA1_CD_FLAGS }, @@ -344,7 +344,7 @@ const KYRAGameDescription adGameDescs[] = { Common::IT_ITA, Common::kPlatformPC, ADGF_CD, - Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIPCSPK + GUIO3(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIPCSPK) }, KYRA1_CD_FLAGS }, @@ -361,7 +361,7 @@ const KYRAGameDescription adGameDescs[] = { Common::EN_ANY, Common::kPlatformMacintosh, ADGF_CD, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, KYRA1_CD_FLAGS }, @@ -377,7 +377,7 @@ const KYRAGameDescription adGameDescs[] = { Common::DE_DEU, Common::kPlatformMacintosh, ADGF_CD, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, KYRA1_CD_FLAGS }, @@ -393,7 +393,7 @@ const KYRAGameDescription adGameDescs[] = { Common::FR_FRA, Common::kPlatformMacintosh, ADGF_CD, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, KYRA1_CD_FLAGS }, @@ -406,7 +406,7 @@ const KYRAGameDescription adGameDescs[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, - Common::GUIO_NOSPEECH | Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIPCSPK + GUIO4(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIPCSPK) }, KYRA1_DEMO_FLAGS }, @@ -419,7 +419,7 @@ const KYRAGameDescription adGameDescs[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO | ADGF_CD, - Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIPCSPK + GUIO3(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIPCSPK) }, KYRA1_DEMO_CD_FLAGS }, @@ -432,7 +432,7 @@ const KYRAGameDescription adGameDescs[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, - Common::GUIO_NOSPEECH | Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM | Common::GUIO_MIDIPCSPK + GUIO5(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK) }, KYRA2_FLOPPY_CMP_FLAGS }, @@ -445,7 +445,7 @@ const KYRAGameDescription adGameDescs[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_NO_FLAGS, - Common::GUIO_NOSPEECH | Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM | Common::GUIO_MIDIPCSPK + GUIO5(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK) }, KYRA2_FLOPPY_CMP_FLAGS }, @@ -458,7 +458,7 @@ const KYRAGameDescription adGameDescs[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, - Common::GUIO_NOSPEECH | Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM | Common::GUIO_MIDIPCSPK + GUIO5(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK) }, KYRA2_FLOPPY_FLAGS }, @@ -471,7 +471,7 @@ const KYRAGameDescription adGameDescs[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_NO_FLAGS, - Common::GUIO_NOSPEECH | Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM | Common::GUIO_MIDIPCSPK + GUIO5(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK) }, KYRA2_FLOPPY_FLAGS }, @@ -484,7 +484,7 @@ const KYRAGameDescription adGameDescs[] = { Common::FR_FRA, Common::kPlatformPC, ADGF_NO_FLAGS, - Common::GUIO_NOSPEECH | Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM | Common::GUIO_MIDIPCSPK + GUIO5(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK) }, KYRA2_FLOPPY_FLAGS }, @@ -497,7 +497,7 @@ const KYRAGameDescription adGameDescs[] = { Common::IT_ITA, Common::kPlatformPC, ADGF_NO_FLAGS, - Common::GUIO_NOSPEECH | Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM | Common::GUIO_MIDIPCSPK + GUIO5(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK) }, KYRA2_FLOPPY_FLAGS }, @@ -510,7 +510,7 @@ const KYRAGameDescription adGameDescs[] = { Common::RU_RUS, Common::kPlatformPC, ADGF_NO_FLAGS, - Common::GUIO_NOSPEECH | Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM | Common::GUIO_MIDIPCSPK + GUIO5(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK) }, KYRA2_FLOPPY_FAN_FLAGS(Common::RU_RUS, Common::EN_ANY) }, @@ -523,7 +523,7 @@ const KYRAGameDescription adGameDescs[] = { Common::RU_RUS, Common::kPlatformPC, ADGF_NO_FLAGS, - Common::GUIO_NOSPEECH | Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM | Common::GUIO_MIDIPCSPK + GUIO5(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK) }, KYRA2_FLOPPY_FAN_FLAGS(Common::RU_RUS, Common::EN_ANY) }, @@ -536,7 +536,7 @@ const KYRAGameDescription adGameDescs[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_DROPLANGUAGE | ADGF_CD, - Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM | Common::GUIO_MIDIPCSPK + GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK) }, KYRA2_CD_FLAGS }, @@ -548,7 +548,7 @@ const KYRAGameDescription adGameDescs[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_DROPLANGUAGE | ADGF_CD, - Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM | Common::GUIO_MIDIPCSPK + GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK) }, KYRA2_CD_FLAGS }, @@ -560,7 +560,7 @@ const KYRAGameDescription adGameDescs[] = { Common::FR_FRA, Common::kPlatformPC, ADGF_DROPLANGUAGE | ADGF_CD, - Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM | Common::GUIO_MIDIPCSPK + GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK) }, KYRA2_CD_FLAGS }, @@ -574,7 +574,7 @@ const KYRAGameDescription adGameDescs[] = { Common::IT_ITA, Common::kPlatformPC, ADGF_DROPLANGUAGE | ADGF_CD, - Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM | Common::GUIO_MIDIPCSPK + GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK) }, KYRA2_CD_FAN_FLAGS(Common::IT_ITA, Common::EN_ANY) }, @@ -586,7 +586,7 @@ const KYRAGameDescription adGameDescs[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_DROPLANGUAGE | ADGF_CD, - Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM | Common::GUIO_MIDIPCSPK + GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK) }, KYRA2_CD_FAN_FLAGS(Common::IT_ITA, Common::EN_ANY) }, @@ -598,7 +598,7 @@ const KYRAGameDescription adGameDescs[] = { Common::FR_FRA, Common::kPlatformPC, ADGF_DROPLANGUAGE | ADGF_CD, - Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM | Common::GUIO_MIDIPCSPK + GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK) }, KYRA2_CD_FAN_FLAGS(Common::IT_ITA, Common::EN_ANY) }, @@ -611,7 +611,7 @@ const KYRAGameDescription adGameDescs[] = { Common::IT_ITA, Common::kPlatformPC, ADGF_DROPLANGUAGE | ADGF_CD, - Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM | Common::GUIO_MIDIPCSPK + GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK) }, KYRA2_CD_FAN_FLAGS(Common::IT_ITA, Common::EN_ANY) }, @@ -624,7 +624,7 @@ const KYRAGameDescription adGameDescs[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_DROPLANGUAGE | ADGF_CD, - Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM | Common::GUIO_MIDIPCSPK + GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK) }, KYRA2_CD_FAN_FLAGS(Common::IT_ITA, Common::EN_ANY) }, @@ -637,7 +637,7 @@ const KYRAGameDescription adGameDescs[] = { Common::FR_FRA, Common::kPlatformPC, ADGF_DROPLANGUAGE | ADGF_CD, - Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM | Common::GUIO_MIDIPCSPK + GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK) }, KYRA2_CD_FAN_FLAGS(Common::IT_ITA, Common::EN_ANY) }, @@ -650,7 +650,7 @@ const KYRAGameDescription adGameDescs[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_DROPLANGUAGE | ADGF_CD | ADGF_DEMO, - Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM | Common::GUIO_MIDIPCSPK + GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK) }, KYRA2_CD_DEMO_FLAGS }, @@ -663,7 +663,7 @@ const KYRAGameDescription adGameDescs[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_DROPLANGUAGE | ADGF_CD | ADGF_DEMO, - Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM | Common::GUIO_MIDIPCSPK + GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK) }, KYRA2_CD_DEMO_FLAGS }, @@ -676,7 +676,7 @@ const KYRAGameDescription adGameDescs[] = { Common::FR_FRA, Common::kPlatformPC, ADGF_DROPLANGUAGE | ADGF_CD | ADGF_DEMO, - Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM | Common::GUIO_MIDIPCSPK + GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK) }, KYRA2_CD_DEMO_FLAGS }, @@ -689,7 +689,7 @@ const KYRAGameDescription adGameDescs[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, - Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM | Common::GUIO_MIDIPCSPK + GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK) }, KYRA2_DEMO_FLAGS }, @@ -702,7 +702,7 @@ const KYRAGameDescription adGameDescs[] = { Common::EN_ANY, Common::kPlatformFMTowns, ADGF_NO_FLAGS, - Common::GUIO_NOSPEECH | Common::GUIO_MIDITOWNS + GUIO2(GUIO_NOSPEECH, GUIO_MIDITOWNS) }, KYRA2_TOWNS_FLAGS }, @@ -714,7 +714,7 @@ const KYRAGameDescription adGameDescs[] = { Common::JA_JPN, Common::kPlatformFMTowns, ADGF_NO_FLAGS, - Common::GUIO_NOSPEECH | Common::GUIO_MIDITOWNS + GUIO2(GUIO_NOSPEECH, GUIO_MIDITOWNS) }, KYRA2_TOWNS_SJIS_FLAGS }, @@ -726,7 +726,7 @@ const KYRAGameDescription adGameDescs[] = { Common::EN_ANY, Common::kPlatformPC98, ADGF_CD, - Common::GUIO_NOSPEECH | Common::GUIO_MIDIPC98 + GUIO2(GUIO_NOSPEECH, GUIO_MIDIPC98) }, KYRA2_TOWNS_FLAGS }, @@ -738,7 +738,7 @@ const KYRAGameDescription adGameDescs[] = { Common::JA_JPN, Common::kPlatformPC98, ADGF_CD, - Common::GUIO_NOSPEECH | Common::GUIO_MIDIPC98 + GUIO2(GUIO_NOSPEECH, GUIO_MIDIPC98) }, KYRA2_TOWNS_SJIS_FLAGS }, @@ -758,7 +758,7 @@ const KYRAGameDescription adGameDescs[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_DROPLANGUAGE, - Common::GUIO_NOMIDI + GUIO1(GUIO_NOMIDI) }, KYRA3_CD_FLAGS }, @@ -774,7 +774,7 @@ const KYRAGameDescription adGameDescs[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_DROPLANGUAGE, - Common::GUIO_NOMIDI + GUIO1(GUIO_NOMIDI) }, KYRA3_CD_FLAGS }, @@ -790,7 +790,7 @@ const KYRAGameDescription adGameDescs[] = { Common::FR_FRA, Common::kPlatformPC, ADGF_DROPLANGUAGE, - Common::GUIO_NOMIDI + GUIO1(GUIO_NOMIDI) }, KYRA3_CD_FLAGS }, @@ -808,7 +808,7 @@ const KYRAGameDescription adGameDescs[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_DROPLANGUAGE, - Common::GUIO_NOMIDI + GUIO1(GUIO_NOMIDI) }, KYRA3_CD_INS_FLAGS }, @@ -824,7 +824,7 @@ const KYRAGameDescription adGameDescs[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_DROPLANGUAGE, - Common::GUIO_NOMIDI + GUIO1(GUIO_NOMIDI) }, KYRA3_CD_INS_FLAGS }, @@ -840,7 +840,7 @@ const KYRAGameDescription adGameDescs[] = { Common::FR_FRA, Common::kPlatformPC, ADGF_DROPLANGUAGE, - Common::GUIO_NOMIDI + GUIO1(GUIO_NOMIDI) }, KYRA3_CD_INS_FLAGS }, @@ -858,7 +858,7 @@ const KYRAGameDescription adGameDescs[] = { Common::EN_ANY, Common::kPlatformMacintosh, ADGF_DROPLANGUAGE, - Common::GUIO_NOMIDI + GUIO1(GUIO_NOMIDI) }, KYRA3_CD_INS_FLAGS }, @@ -874,7 +874,7 @@ const KYRAGameDescription adGameDescs[] = { Common::DE_DEU, Common::kPlatformMacintosh, ADGF_DROPLANGUAGE, - Common::GUIO_NOMIDI + GUIO1(GUIO_NOMIDI) }, KYRA3_CD_INS_FLAGS }, @@ -890,7 +890,7 @@ const KYRAGameDescription adGameDescs[] = { Common::FR_FRA, Common::kPlatformMacintosh, ADGF_DROPLANGUAGE, - Common::GUIO_NOMIDI + GUIO1(GUIO_NOMIDI) }, KYRA3_CD_INS_FLAGS }, @@ -908,7 +908,7 @@ const KYRAGameDescription adGameDescs[] = { Common::ES_ESP, Common::kPlatformPC, ADGF_DROPLANGUAGE, - Common::GUIO_NOMIDI + GUIO1(GUIO_NOMIDI) }, KYRA3_CD_FAN_FLAGS(Common::ES_ESP, Common::EN_ANY) }, @@ -924,7 +924,7 @@ const KYRAGameDescription adGameDescs[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_DROPLANGUAGE, - Common::GUIO_NOMIDI + GUIO1(GUIO_NOMIDI) }, KYRA3_CD_FAN_FLAGS(Common::ES_ESP, Common::EN_ANY) }, @@ -940,7 +940,7 @@ const KYRAGameDescription adGameDescs[] = { Common::FR_FRA, Common::kPlatformPC, ADGF_DROPLANGUAGE, - Common::GUIO_NOMIDI + GUIO1(GUIO_NOMIDI) }, KYRA3_CD_FAN_FLAGS(Common::ES_ESP, Common::EN_ANY) }, @@ -958,7 +958,7 @@ const KYRAGameDescription adGameDescs[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_DROPLANGUAGE, - Common::GUIO_NOMIDI + GUIO1(GUIO_NOMIDI) }, KYRA3_CD_FAN_FLAGS(Common::IT_ITA, Common::FR_FRA) }, @@ -974,7 +974,7 @@ const KYRAGameDescription adGameDescs[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_DROPLANGUAGE, - Common::GUIO_NOMIDI + GUIO1(GUIO_NOMIDI) }, KYRA3_CD_FAN_FLAGS(Common::IT_ITA, Common::FR_FRA) }, @@ -990,7 +990,7 @@ const KYRAGameDescription adGameDescs[] = { Common::IT_ITA, Common::kPlatformPC, ADGF_DROPLANGUAGE, - Common::GUIO_NOMIDI + GUIO1(GUIO_NOMIDI) }, KYRA3_CD_FAN_FLAGS(Common::IT_ITA, Common::FR_FRA) }, @@ -1009,7 +1009,7 @@ const KYRAGameDescription adGameDescs[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_DROPLANGUAGE | ADGF_CD, - Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM | Common::GUIO_MIDIPCSPK + GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK) }, LOL_CD_FLAGS }, @@ -1026,7 +1026,7 @@ const KYRAGameDescription adGameDescs[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_DROPLANGUAGE | ADGF_CD, - Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM | Common::GUIO_MIDIPCSPK + GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK) }, LOL_CD_FLAGS }, @@ -1043,7 +1043,7 @@ const KYRAGameDescription adGameDescs[] = { Common::FR_FRA, Common::kPlatformPC, ADGF_DROPLANGUAGE | ADGF_CD, - Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM | Common::GUIO_MIDIPCSPK + GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK) }, LOL_CD_FLAGS }, @@ -1060,7 +1060,7 @@ const KYRAGameDescription adGameDescs[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_DROPLANGUAGE | ADGF_CD, - Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM | Common::GUIO_MIDIPCSPK + GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK) }, LOL_CD_FLAGS }, @@ -1077,7 +1077,7 @@ const KYRAGameDescription adGameDescs[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_DROPLANGUAGE | ADGF_CD, - Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM | Common::GUIO_MIDIPCSPK + GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK) }, LOL_CD_FLAGS }, @@ -1094,7 +1094,7 @@ const KYRAGameDescription adGameDescs[] = { Common::FR_FRA, Common::kPlatformPC, ADGF_DROPLANGUAGE | ADGF_CD, - Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM | Common::GUIO_MIDIPCSPK + GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK) }, LOL_CD_FLAGS }, @@ -1112,7 +1112,7 @@ const KYRAGameDescription adGameDescs[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_DROPLANGUAGE | ADGF_CD, - Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM | Common::GUIO_MIDIPCSPK + GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK) }, LOL_CD_FAN_FLAGS(Common::RU_RUS, Common::DE_DEU) }, @@ -1130,7 +1130,7 @@ const KYRAGameDescription adGameDescs[] = { Common::FR_FRA, Common::kPlatformPC, ADGF_DROPLANGUAGE | ADGF_CD, - Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM | Common::GUIO_MIDIPCSPK + GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK) }, LOL_CD_FAN_FLAGS(Common::RU_RUS, Common::DE_DEU) }, @@ -1147,7 +1147,7 @@ const KYRAGameDescription adGameDescs[] = { Common::RU_RUS, Common::kPlatformPC, ADGF_DROPLANGUAGE | ADGF_CD, - Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM | Common::GUIO_MIDIPCSPK + GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK) }, LOL_CD_FAN_FLAGS(Common::RU_RUS, Common::DE_DEU) }, @@ -1165,7 +1165,7 @@ const KYRAGameDescription adGameDescs[] = { Common::IT_ITA, Common::kPlatformPC, ADGF_DROPLANGUAGE | ADGF_CD, - Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM | Common::GUIO_MIDIPCSPK + GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK) }, LOL_CD_FAN_FLAGS(Common::IT_ITA, Common::EN_ANY) }, @@ -1182,7 +1182,7 @@ const KYRAGameDescription adGameDescs[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_DROPLANGUAGE | ADGF_CD, - Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM | Common::GUIO_MIDIPCSPK + GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK) }, LOL_CD_FAN_FLAGS(Common::IT_ITA, Common::EN_ANY) }, @@ -1199,7 +1199,7 @@ const KYRAGameDescription adGameDescs[] = { Common::FR_FRA, Common::kPlatformPC, ADGF_DROPLANGUAGE | ADGF_CD, - Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM | Common::GUIO_MIDIPCSPK + GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK) }, LOL_CD_FAN_FLAGS(Common::IT_ITA, Common::EN_ANY) }, @@ -1216,7 +1216,7 @@ const KYRAGameDescription adGameDescs[] = { Common::IT_ITA, Common::kPlatformPC, ADGF_DROPLANGUAGE | ADGF_CD, - Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM | Common::GUIO_MIDIPCSPK + GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK) }, LOL_CD_FAN_FLAGS(Common::IT_ITA, Common::EN_ANY) }, @@ -1233,7 +1233,7 @@ const KYRAGameDescription adGameDescs[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_DROPLANGUAGE | ADGF_CD, - Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM | Common::GUIO_MIDIPCSPK + GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK) }, LOL_CD_FAN_FLAGS(Common::IT_ITA, Common::EN_ANY) }, @@ -1250,7 +1250,7 @@ const KYRAGameDescription adGameDescs[] = { Common::FR_FRA, Common::kPlatformPC, ADGF_DROPLANGUAGE | ADGF_CD, - Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM | Common::GUIO_MIDIPCSPK + GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK) }, LOL_CD_FAN_FLAGS(Common::IT_ITA, Common::EN_ANY) }, @@ -1266,7 +1266,7 @@ const KYRAGameDescription adGameDescs[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, - Common::GUIO_NOSPEECH | Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM | Common::GUIO_MIDIPCSPK + GUIO5(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK) }, LOL_FLOPPY_CMP_FLAGS }, @@ -1282,7 +1282,7 @@ const KYRAGameDescription adGameDescs[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, - Common::GUIO_NOSPEECH | Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM | Common::GUIO_MIDIPCSPK + GUIO5(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK) }, LOL_FLOPPY_CMP_FLAGS }, @@ -1298,7 +1298,7 @@ const KYRAGameDescription adGameDescs[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_NO_FLAGS, - Common::GUIO_NOSPEECH | Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM | Common::GUIO_MIDIPCSPK + GUIO5(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK) }, LOL_FLOPPY_CMP_FLAGS }, @@ -1315,7 +1315,7 @@ const KYRAGameDescription adGameDescs[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, - Common::GUIO_NOSPEECH | Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM | Common::GUIO_MIDIPCSPK + GUIO5(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK) }, LOL_FLOPPY_FLAGS }, @@ -1332,7 +1332,7 @@ const KYRAGameDescription adGameDescs[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, - Common::GUIO_NOSPEECH | Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM | Common::GUIO_MIDIPCSPK + GUIO5(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK) }, LOL_FLOPPY_FLAGS }, @@ -1349,7 +1349,7 @@ const KYRAGameDescription adGameDescs[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, - Common::GUIO_NOSPEECH | Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM | Common::GUIO_MIDIPCSPK + GUIO5(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK) }, LOL_FLOPPY_FLAGS }, @@ -1366,7 +1366,7 @@ const KYRAGameDescription adGameDescs[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_NO_FLAGS, - Common::GUIO_NOSPEECH | Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM | Common::GUIO_MIDIPCSPK + GUIO5(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK) }, LOL_FLOPPY_FLAGS }, @@ -1384,7 +1384,7 @@ const KYRAGameDescription adGameDescs[] = { Common::RU_RUS, Common::kPlatformPC, ADGF_NO_FLAGS, - Common::GUIO_NOSPEECH | Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM | Common::GUIO_MIDIPCSPK + GUIO5(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK) }, LOL_FLOPPY_FAN_FLAGS(Common::RU_RUS, Common::EN_ANY) }, @@ -1401,7 +1401,7 @@ const KYRAGameDescription adGameDescs[] = { Common::JA_JPN, Common::kPlatformPC98, ADGF_NO_FLAGS, - Common::GUIO_NOSPEECH | Common::GUIO_MIDIPC98 + GUIO2(GUIO_NOSPEECH, GUIO_MIDIPC98) }, LOL_PC98_SJIS_FLAGS }, @@ -1418,7 +1418,7 @@ const KYRAGameDescription adGameDescs[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, - Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM | Common::GUIO_MIDIPCSPK + GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK) }, LOL_DEMO_FLAGS }, @@ -1434,7 +1434,7 @@ const KYRAGameDescription adGameDescs[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, - Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM | Common::GUIO_MIDIPCSPK + GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK) }, LOL_KYRA2_DEMO_FLAGS }, diff --git a/engines/lastexpress/detection.cpp b/engines/lastexpress/detection.cpp index 0a177809dd..e2133c0929 100644 --- a/engines/lastexpress/detection.cpp +++ b/engines/lastexpress/detection.cpp @@ -48,7 +48,7 @@ static const ADGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformUnknown, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, // The Last Express (English) - UK Broderbund Release @@ -66,7 +66,7 @@ static const ADGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformUnknown, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, // The Last Express (English) - Interplay Release @@ -84,7 +84,7 @@ static const ADGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformUnknown, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, // The Last Express (Demo - English) - Broderbund @@ -99,7 +99,7 @@ static const ADGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformUnknown, ADGF_DEMO | ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, // The Last Express (French) - Broderbund Release @@ -117,7 +117,7 @@ static const ADGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformUnknown, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, // The Last Express (German) @@ -135,7 +135,7 @@ static const ADGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformUnknown, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, // The Last Express (Spanish) @@ -153,7 +153,7 @@ static const ADGameDescription gameDescriptions[] = { Common::ES_ESP, Common::kPlatformUnknown, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, // The Last Express (Italian) @@ -171,7 +171,7 @@ static const ADGameDescription gameDescriptions[] = { Common::IT_ITA, Common::kPlatformUnknown, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, // The Last Express (Russian) @@ -189,7 +189,7 @@ static const ADGameDescription gameDescriptions[] = { Common::RU_RUS, Common::kPlatformUnknown, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, AD_TABLE_END_MARKER @@ -200,7 +200,7 @@ class LastExpressMetaEngine : public AdvancedMetaEngine { public: LastExpressMetaEngine() : AdvancedMetaEngine(gameDescriptions, sizeof(ADGameDescription), lastExpressGames) { _singleid = "lastexpress"; - _guioptions = Common::GUIO_NOSUBTITLES | Common::GUIO_NOSFX; + _guioptions = GUIO2(GUIO_NOSUBTITLES, GUIO_NOSFX); } const char *getName() const { diff --git a/engines/lure/detection.cpp b/engines/lure/detection.cpp index 081625863d..276b2d77af 100644 --- a/engines/lure/detection.cpp +++ b/engines/lure/detection.cpp @@ -63,8 +63,6 @@ static const PlainGameDescriptor lureGames[] = { namespace Lure { -using Common::GUIO_NONE; - static const LureGameDescription gameDescriptions[] = { { { @@ -74,7 +72,7 @@ static const LureGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GF_FLOPPY, }, @@ -87,7 +85,7 @@ static const LureGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GF_FLOPPY | GF_EGA, }, @@ -100,7 +98,7 @@ static const LureGameDescription gameDescriptions[] = { Common::IT_ITA, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GF_FLOPPY, }, @@ -113,7 +111,7 @@ static const LureGameDescription gameDescriptions[] = { Common::IT_ITA, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GF_FLOPPY | GF_EGA, }, @@ -126,7 +124,7 @@ static const LureGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GF_FLOPPY, }, @@ -139,7 +137,7 @@ static const LureGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GF_FLOPPY, }, @@ -152,7 +150,7 @@ static const LureGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GF_FLOPPY, }, @@ -165,7 +163,7 @@ static const LureGameDescription gameDescriptions[] = { Common::ES_ESP, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GF_FLOPPY, }, @@ -184,7 +182,7 @@ public: // Use kADFlagUseExtraAsHint to distinguish between EGA and VGA versions // of italian Lure when their datafiles sit in the same directory. _flags = kADFlagUseExtraAsHint; - _guioptions = Common::GUIO_NOSPEECH; + _guioptions = GUIO1(GUIO_NOSPEECH); } virtual const char *getName() const { diff --git a/engines/m4/detection.cpp b/engines/m4/detection.cpp index 9c359c081f..58a5db6c89 100644 --- a/engines/m4/detection.cpp +++ b/engines/m4/detection.cpp @@ -65,9 +65,6 @@ const char *MadsM4Engine::getGameFile(int fileType) { return NULL; } -using Common::GUIO_NONE; -using Common::GUIO_NOSPEECH; - static const M4GameDescription gameDescriptions[] = { { { @@ -80,7 +77,7 @@ static const M4GameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_Burger, kFeaturesCD @@ -96,7 +93,7 @@ static const M4GameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_UNSTABLE, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_Burger, kFeaturesCD @@ -112,7 +109,7 @@ static const M4GameDescription gameDescriptions[] = { Common::RU_RUS, Common::kPlatformPC, ADGF_UNSTABLE, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_Burger, kFeaturesCD @@ -128,7 +125,7 @@ static const M4GameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO | ADGF_UNSTABLE, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_Burger, kFeaturesDemo @@ -144,7 +141,7 @@ static const M4GameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO | ADGF_UNSTABLE, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_Burger, kFeaturesDemo @@ -160,7 +157,7 @@ static const M4GameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_Riddle, kFeaturesCD @@ -176,7 +173,7 @@ static const M4GameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_Riddle, kFeaturesCD @@ -192,7 +189,7 @@ static const M4GameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_UNSTABLE, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_Riddle, kFeaturesCD @@ -208,7 +205,7 @@ static const M4GameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformPC, ADGF_UNSTABLE, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_Riddle, kFeaturesCD @@ -224,7 +221,7 @@ static const M4GameDescription gameDescriptions[] = { Common::ES_ESP, Common::kPlatformPC, ADGF_UNSTABLE, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_Riddle, kFeaturesCD @@ -240,7 +237,7 @@ static const M4GameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO | ADGF_UNSTABLE, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_Riddle, kFeaturesDemo @@ -256,7 +253,7 @@ static const M4GameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GType_RexNebular, kFeaturesNone @@ -272,7 +269,7 @@ static const M4GameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO | ADGF_UNSTABLE, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_RexNebular, kFeaturesDemo @@ -288,7 +285,7 @@ static const M4GameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GType_DragonSphere, kFeaturesNone @@ -305,7 +302,7 @@ static const M4GameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_DragonSphere, kFeaturesCD @@ -321,7 +318,7 @@ static const M4GameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO | ADGF_UNSTABLE, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_DragonSphere, kFeaturesDemo @@ -337,7 +334,7 @@ static const M4GameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GType_Phantom, kFeaturesNone @@ -353,7 +350,7 @@ static const M4GameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_Phantom, kFeaturesCD @@ -369,7 +366,7 @@ static const M4GameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO | ADGF_UNSTABLE, - GUIO_NONE + GUIO1(GUIO_NONE) }, GType_Phantom, kFeaturesDemo @@ -388,7 +385,7 @@ class M4MetaEngine : public AdvancedMetaEngine { public: M4MetaEngine() : AdvancedMetaEngine(M4::gameDescriptions, sizeof(M4::M4GameDescription), m4Games) { _singleid = "m4"; - _guioptions = Common::GUIO_NOMIDI; + _guioptions = GUIO1(GUIO_NOMIDI); _maxScanDepth = 2; _directoryGlobs = directoryGlobs; } diff --git a/engines/made/detection.cpp b/engines/made/detection.cpp index f653e95a54..2a9beed5c4 100644 --- a/engines/made/detection.cpp +++ b/engines/made/detection.cpp @@ -65,9 +65,6 @@ static const PlainGameDescriptor madeGames[] = { namespace Made { -using Common::GUIO_NONE; -using Common::GUIO_NOSPEECH; - static const MadeGameDescription gameDescriptions[] = { { // NOTE: Return to Zork entries with *.dat are used to detect the game via rtzcd.dat, @@ -83,7 +80,7 @@ static const MadeGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_RTZ, 0, @@ -101,7 +98,7 @@ static const MadeGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_CD, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_RTZ, 0, @@ -118,7 +115,7 @@ static const MadeGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_CD, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_RTZ, 0, @@ -135,7 +132,7 @@ static const MadeGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_CD, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_RTZ, 0, @@ -153,7 +150,7 @@ static const MadeGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_CD, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_RTZ, 0, @@ -170,7 +167,7 @@ static const MadeGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_CD, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_RTZ, 0, @@ -188,7 +185,7 @@ static const MadeGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_CD, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_RTZ, 0, @@ -206,7 +203,7 @@ static const MadeGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_CD, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_RTZ, 0, @@ -224,7 +221,7 @@ static const MadeGameDescription gameDescriptions[] = { Common::IT_ITA, Common::kPlatformPC, ADGF_CD, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_RTZ, 0, @@ -242,7 +239,7 @@ static const MadeGameDescription gameDescriptions[] = { Common::IT_ITA, Common::kPlatformPC, ADGF_CD, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_RTZ, 0, @@ -260,7 +257,7 @@ static const MadeGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformPC, ADGF_CD, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_RTZ, 0, @@ -278,7 +275,7 @@ static const MadeGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformPC, ADGF_CD, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_RTZ, 0, @@ -295,7 +292,7 @@ static const MadeGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GID_RTZ, 0, @@ -312,7 +309,7 @@ static const MadeGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_RTZ, 0, @@ -330,7 +327,7 @@ static const MadeGameDescription gameDescriptions[] = { Common::JA_JPN, Common::kPlatformPC, ADGF_CD, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_RTZ, 0, @@ -348,7 +345,7 @@ static const MadeGameDescription gameDescriptions[] = { Common::JA_JPN, Common::kPlatformFMTowns, ADGF_CD, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_RTZ, 0, @@ -366,7 +363,7 @@ static const MadeGameDescription gameDescriptions[] = { Common::JA_JPN, Common::kPlatformPC98, ADGF_CD, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_RTZ, 0, @@ -383,7 +380,7 @@ static const MadeGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_CD, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GID_MANHOLE, 0, @@ -400,7 +397,7 @@ static const MadeGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GID_MANHOLE, 0, @@ -417,7 +414,7 @@ static const MadeGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GID_LGOP2, 0, @@ -435,7 +432,7 @@ static const MadeGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GID_LGOP2, 0, @@ -453,7 +450,7 @@ static const MadeGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GID_LGOP2, 0, @@ -471,7 +468,7 @@ static const MadeGameDescription gameDescriptions[] = { Common::ES_ESP, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GID_LGOP2, 0, @@ -488,7 +485,7 @@ static const MadeGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GID_RODNEY, 0, @@ -511,7 +508,7 @@ static MadeGameDescription g_fallbackDesc = { Common::UNK_LANG, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, 0, 0, diff --git a/engines/mohawk/detection_tables.h b/engines/mohawk/detection_tables.h index 10c089443f..94f18e134b 100644 --- a/engines/mohawk/detection_tables.h +++ b/engines/mohawk/detection_tables.h @@ -34,7 +34,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_MYST, 0, @@ -52,7 +52,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_DEMO | ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_MYST, GF_DEMO, @@ -70,7 +70,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformWindows, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_MYST, 0, @@ -88,7 +88,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformWindows, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_MYST, 0, @@ -106,7 +106,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::ES_ESP, Common::kPlatformWindows, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_MYST, 0, @@ -124,7 +124,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::JA_JPN, Common::kPlatformWindows, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_MYST, 0, @@ -142,7 +142,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformWindows, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_MYST, 0, @@ -160,7 +160,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_MAKINGOF, 0, @@ -178,7 +178,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::JA_JPN, Common::kPlatformWindows, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_MAKINGOF, 0, @@ -196,7 +196,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_MYST, GF_ME, @@ -214,7 +214,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformMacintosh, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_MYST, GF_ME, @@ -232,7 +232,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformWindows, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_MYST, GF_ME, @@ -250,7 +250,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformWindows, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_MYST, GF_ME, @@ -268,7 +268,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_RIVEN, 0, @@ -286,7 +286,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_RIVEN, 0, @@ -304,7 +304,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::ES_ESP, Common::kPlatformWindows, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_RIVEN, 0, @@ -322,7 +322,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_RIVEN, GF_DVD, @@ -340,7 +340,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformWindows, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_RIVEN, GF_DVD, @@ -358,7 +358,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformWindows, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_RIVEN, GF_DVD, @@ -376,7 +376,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_DEMO | ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_RIVEN, GF_DEMO, @@ -391,7 +391,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_CSTIME, 0, @@ -406,7 +406,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_DEMO | ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_CSTIME, GF_DEMO, @@ -422,7 +422,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_ZOOMBINI, GF_HASMIDI, @@ -437,7 +437,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_ZOOMBINI, GF_HASMIDI, @@ -452,7 +452,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_ZOOMBINI, GF_HASMIDI, @@ -467,7 +467,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformWindows, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_ZOOMBINI, GF_HASMIDI, @@ -482,7 +482,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformWindows, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_ZOOMBINI, GF_HASMIDI, @@ -497,7 +497,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_CSWORLD, 0, @@ -512,7 +512,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_CSWORLD, 0, @@ -527,7 +527,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_CSAMTRAK, 0, @@ -545,7 +545,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_GRB, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV2, 0, @@ -563,7 +563,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV2, 0, @@ -581,7 +581,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV2, 0, @@ -597,7 +597,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_GRB, Common::kPlatformMacintosh, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV2, 0, @@ -613,7 +613,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformMacintosh, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV2, 0, @@ -629,7 +629,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformMacintosh, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV2, 0, @@ -646,7 +646,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV1, 0, @@ -663,7 +663,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV1, 0, @@ -678,7 +678,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV5, 0, @@ -693,7 +693,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV5, 0, @@ -709,7 +709,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV3, 0, @@ -724,7 +724,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV3, 0, @@ -739,7 +739,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformMacintosh, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV3, 0, @@ -754,7 +754,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_JAMESMATH, GF_HASMIDI, @@ -770,7 +770,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_JAMESMATH, GF_HASMIDI, @@ -785,7 +785,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_TREEHOUSE, GF_HASMIDI, @@ -800,7 +800,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV3, 0, @@ -816,7 +816,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV3, 0, @@ -831,7 +831,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformMacintosh, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV3, 0, @@ -846,7 +846,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV2, 0, @@ -862,7 +862,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV2, 0, @@ -877,7 +877,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformMacintosh, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV2, 0, @@ -892,7 +892,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformMacintosh, ADGF_DEMO, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV2, GF_DEMO, @@ -907,7 +907,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_1STDEGREE, GF_HASMIDI, @@ -925,7 +925,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformWindows, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_1STDEGREE, GF_HASMIDI, @@ -940,7 +940,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_CSUSA, 0, @@ -955,7 +955,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV1, 0, @@ -972,7 +972,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV1, 0, @@ -988,7 +988,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_GRB, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV2, 0, @@ -1004,7 +1004,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_GRB, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV2, 0, @@ -1020,7 +1020,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV2, 0, @@ -1036,7 +1036,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV2, 0, @@ -1052,7 +1052,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV2, 0, @@ -1068,7 +1068,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV2, 0, @@ -1083,7 +1083,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_DEMO, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV1, GF_DEMO, @@ -1098,7 +1098,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_DEMO, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV1, GF_DEMO, @@ -1114,7 +1114,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_DEMO, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV1, GF_DEMO, @@ -1129,7 +1129,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformMacintosh, ADGF_DEMO, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV1, GF_DEMO, @@ -1144,7 +1144,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV1, GF_LB_10, @@ -1161,7 +1161,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV1, GF_LB_10, @@ -1177,7 +1177,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformMacintosh, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV1, GF_LB_10, @@ -1193,7 +1193,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV1, GF_LB_10, @@ -1208,7 +1208,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_DEMO, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV1, GF_DEMO | GF_LB_10, @@ -1223,7 +1223,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_DEMO, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV1, GF_DEMO, @@ -1239,7 +1239,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_DEMO, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV1, GF_DEMO, @@ -1254,7 +1254,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformMacintosh, ADGF_DEMO, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV1, GF_DEMO | GF_LB_10, @@ -1269,7 +1269,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformMacintosh, ADGF_DEMO, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV1, GF_DEMO, @@ -1286,7 +1286,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV3, 0, @@ -1303,7 +1303,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV1, GF_LB_10, @@ -1319,7 +1319,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV1, GF_LB_10, @@ -1335,7 +1335,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_GRB, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV2, 0, @@ -1351,7 +1351,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV2, 0, @@ -1367,7 +1367,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV2, 0, @@ -1382,7 +1382,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_DEMO, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV1, GF_DEMO | GF_LB_10, @@ -1397,7 +1397,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_DEMO, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV1, GF_DEMO, @@ -1413,7 +1413,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_DEMO, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV1, GF_DEMO, @@ -1428,7 +1428,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformMacintosh, ADGF_DEMO, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV1, GF_DEMO | GF_LB_10, @@ -1443,7 +1443,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformMacintosh, ADGF_DEMO, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV1, GF_DEMO, @@ -1460,7 +1460,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV1, 0, @@ -1476,7 +1476,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformMacintosh, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV1, 0, @@ -1491,7 +1491,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_DEMO, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV1, GF_DEMO, @@ -1507,7 +1507,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_DEMO, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV1, GF_DEMO, @@ -1522,7 +1522,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformMacintosh, ADGF_DEMO, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV1, GF_DEMO, @@ -1538,7 +1538,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV1, 0, @@ -1555,7 +1555,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV1, 0, @@ -1571,7 +1571,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformMacintosh, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV1, 0, @@ -1586,7 +1586,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_DEMO, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV1, GF_DEMO, @@ -1601,7 +1601,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_DEMO, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV1, GF_DEMO, @@ -1617,7 +1617,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_DEMO, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV1, GF_DEMO, @@ -1632,7 +1632,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformMacintosh, ADGF_DEMO, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV1, GF_DEMO, @@ -1647,7 +1647,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV3, 0, @@ -1663,7 +1663,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV3, 0, @@ -1678,7 +1678,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformMacintosh, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV3, 0, @@ -1694,7 +1694,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV1, 0, @@ -1710,7 +1710,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformMacintosh, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV1, 0, @@ -1726,7 +1726,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_GRB, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV2, 0, @@ -1742,7 +1742,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV2, 0, @@ -1758,7 +1758,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV2, 0, @@ -1775,7 +1775,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV3, 0, @@ -1790,7 +1790,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_DEMO, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV1, GF_DEMO, @@ -1806,7 +1806,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_DEMO, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV1, GF_DEMO, @@ -1821,7 +1821,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformMacintosh, ADGF_DEMO, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV1, GF_DEMO, @@ -1836,7 +1836,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV1, 0, @@ -1851,7 +1851,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformMacintosh, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV1, 0, @@ -1867,7 +1867,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_GRB, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV2, 0, @@ -1883,7 +1883,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV2, 0, @@ -1899,7 +1899,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV2, 0, @@ -1915,7 +1915,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_GRB, Common::kPlatformMacintosh, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV2, 0, @@ -1931,7 +1931,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformMacintosh, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV2, 0, @@ -1947,7 +1947,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformMacintosh, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV2, 0, @@ -1963,7 +1963,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_DEMO, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV1, GF_DEMO, @@ -1978,7 +1978,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV3, 0, @@ -1993,7 +1993,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformMacintosh, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV3, 0, @@ -2008,7 +2008,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV4, 0, @@ -2023,7 +2023,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformMacintosh, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV4, 0, @@ -2041,7 +2041,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformWindows, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV4, 0, @@ -2056,7 +2056,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV1, 0, @@ -2071,7 +2071,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformMacintosh, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV1, 0, @@ -2086,7 +2086,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV2, 0, @@ -2102,7 +2102,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformMacintosh, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV1, 0, @@ -2117,7 +2117,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV3, 0, @@ -2132,7 +2132,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformMacintosh, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV3, 0, @@ -2147,7 +2147,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV1, 0, @@ -2164,7 +2164,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV1, 0, @@ -2179,7 +2179,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformMacintosh, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV1, 0, @@ -2195,7 +2195,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV3, 0, @@ -2212,7 +2212,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV3, 0, @@ -2228,7 +2228,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformMacintosh, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV3, 0, @@ -2243,7 +2243,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV4, 0, @@ -2258,7 +2258,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformMacintosh, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV4, 0, @@ -2275,7 +2275,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV2, 0, @@ -2291,7 +2291,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV2, 0, @@ -2307,7 +2307,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformMacintosh, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV2, 0, @@ -2324,7 +2324,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV2, 0, @@ -2340,7 +2340,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformMacintosh, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV2, 0, @@ -2356,7 +2356,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_GRB, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV2, 0, @@ -2372,7 +2372,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV2, 0, @@ -2388,7 +2388,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV2, 0, @@ -2404,7 +2404,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::EN_GRB, Common::kPlatformMacintosh, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV2, 0, @@ -2420,7 +2420,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformMacintosh, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV2, 0, @@ -2436,7 +2436,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformMacintosh, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_LIVINGBOOKSV2, 0, @@ -2459,7 +2459,7 @@ static const MohawkGameDescription fallbackDescs[] = { Common::UNK_LANG, Common::kPlatformWindows, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_MYST, 0, @@ -2474,7 +2474,7 @@ static const MohawkGameDescription fallbackDescs[] = { Common::UNK_LANG, Common::kPlatformWindows, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_MAKINGOF, 0, @@ -2489,7 +2489,7 @@ static const MohawkGameDescription fallbackDescs[] = { Common::UNK_LANG, Common::kPlatformWindows, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_MYST, GF_ME, @@ -2504,7 +2504,7 @@ static const MohawkGameDescription fallbackDescs[] = { Common::UNK_LANG, Common::kPlatformWindows, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_RIVEN, 0, @@ -2519,7 +2519,7 @@ static const MohawkGameDescription fallbackDescs[] = { Common::UNK_LANG, Common::kPlatformWindows, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, GType_RIVEN, GF_DVD, diff --git a/engines/parallaction/detection.cpp b/engines/parallaction/detection.cpp index d0610f7a29..43176a0759 100644 --- a/engines/parallaction/detection.cpp +++ b/engines/parallaction/detection.cpp @@ -53,9 +53,6 @@ static const PlainGameDescriptor parallactionGames[] = { namespace Parallaction { -using Common::GUIO_NONE; -using Common::GUIO_NOSPEECH; - static const PARALLACTIONGameDescription gameDescriptions[] = { { { @@ -75,7 +72,7 @@ static const PARALLACTIONGameDescription gameDescriptions[] = { Common::UNK_LANG, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GType_Nippon, GF_LANG_EN | GF_LANG_FR | GF_LANG_DE | GF_LANG_IT | GF_LANG_MULT, @@ -99,7 +96,7 @@ static const PARALLACTIONGameDescription gameDescriptions[] = { Common::UNK_LANG, Common::kPlatformAmiga, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GType_Nippon, GF_LANG_EN | GF_LANG_FR | GF_LANG_DE | GF_LANG_MULT, @@ -117,7 +114,7 @@ static const PARALLACTIONGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformAmiga, ADGF_DEMO, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GType_Nippon, GF_LANG_EN | GF_DEMO, @@ -140,7 +137,7 @@ static const PARALLACTIONGameDescription gameDescriptions[] = { Common::IT_ITA, Common::kPlatformAmiga, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GType_Nippon, GF_LANG_IT, @@ -158,7 +155,7 @@ static const PARALLACTIONGameDescription gameDescriptions[] = { Common::UNK_LANG, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GType_BRA, GF_LANG_EN | GF_LANG_FR | GF_LANG_DE | GF_LANG_IT | GF_LANG_MULT, @@ -175,7 +172,7 @@ static const PARALLACTIONGameDescription gameDescriptions[] = { Common::UNK_LANG, Common::kPlatformPC, ADGF_DEMO, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GType_BRA, GF_LANG_EN | GF_DEMO, @@ -192,7 +189,7 @@ static const PARALLACTIONGameDescription gameDescriptions[] = { Common::UNK_LANG, Common::kPlatformAmiga, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GType_BRA, GF_LANG_EN | GF_LANG_FR | GF_LANG_DE | GF_LANG_IT | GF_LANG_MULT, @@ -209,7 +206,7 @@ static const PARALLACTIONGameDescription gameDescriptions[] = { Common::UNK_LANG, Common::kPlatformAmiga, ADGF_DEMO, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GType_BRA, GF_LANG_EN | GF_DEMO, @@ -223,7 +220,7 @@ static const PARALLACTIONGameDescription gameDescriptions[] = { class ParallactionMetaEngine : public AdvancedMetaEngine { public: ParallactionMetaEngine() : AdvancedMetaEngine(Parallaction::gameDescriptions, sizeof(Parallaction::PARALLACTIONGameDescription), parallactionGames) { - _guioptions = Common::GUIO_NOLAUNCHLOAD; + _guioptions = GUIO1(GUIO_NOLAUNCHLOAD); } virtual const char *getName() const { diff --git a/engines/queen/queen.cpp b/engines/queen/queen.cpp index a10e74bfd8..c610ef9921 100644 --- a/engines/queen/queen.cpp +++ b/engines/queen/queen.cpp @@ -120,13 +120,13 @@ GameList QueenMetaEngine::detectGames(const Common::FSList &fslist) const { GameDescriptor dg(queenGameDescriptor.gameid, queenGameDescriptor.description, version.language, version.platform); if (version.features & Queen::GF_DEMO) { dg.updateDesc("Demo"); - dg.setGUIOptions(Common::GUIO_NOSPEECH); + dg.setGUIOptions(GUIO_NOSPEECH); } else if (version.features & Queen::GF_INTERVIEW) { dg.updateDesc("Interview"); - dg.setGUIOptions(Common::GUIO_NOSPEECH); + dg.setGUIOptions(GUIO_NOSPEECH); } else if (version.features & Queen::GF_FLOPPY) { dg.updateDesc("Floppy"); - dg.setGUIOptions(Common::GUIO_NOSPEECH); + dg.setGUIOptions(GUIO_NOSPEECH); } else if (version.features & Queen::GF_TALKIE) { dg.updateDesc("Talkie"); } diff --git a/engines/saga/detection_tables.h b/engines/saga/detection_tables.h index 3e83c30eef..863c2cee64 100644 --- a/engines/saga/detection_tables.h +++ b/engines/saga/detection_tables.h @@ -164,9 +164,6 @@ static const GamePatchDescription ITEMacPatch_Files[] = { { NULL, 0, 0} }; -using Common::GUIO_NONE; -using Common::GUIO_NOSPEECH; - static const SAGAGameDescription gameDescriptions[] = { // ITE Section //////////////////////////////////////////////////////////////////////////////////////////// @@ -193,7 +190,7 @@ static const SAGAGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GID_ITE, // Game id GF_OLD_ITE_DOS, // features @@ -218,7 +215,7 @@ static const SAGAGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformMacintosh, ADGF_DEMO, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GID_ITE, 0, @@ -244,7 +241,7 @@ static const SAGAGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformMacintosh, ADGF_DEMO, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GID_ITE, 0, @@ -270,7 +267,7 @@ static const SAGAGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_DEMO, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_ITE, 0, @@ -296,7 +293,7 @@ static const SAGAGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_DEMO, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_ITE, GF_8BIT_UNSIGNED_PCM, @@ -329,7 +326,7 @@ static const SAGAGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformMacintosh, ADGF_CD, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_ITE, GF_8BIT_UNSIGNED_PCM, @@ -353,7 +350,7 @@ static const SAGAGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformMacintosh, ADGF_CD, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_ITE, 0, @@ -385,7 +382,7 @@ static const SAGAGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformUnknown, ADGF_CD, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_ITE, 0, @@ -415,7 +412,7 @@ static const SAGAGameDescription gameDescriptions[] = { Common::IT_ITA, Common::kPlatformUnknown, ADGF_CD, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_ITE, 0, @@ -439,7 +436,7 @@ static const SAGAGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_CD, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_ITE, GF_EXTRA_ITE_CREDITS, @@ -463,7 +460,7 @@ static const SAGAGameDescription gameDescriptions[] = { Common::IT_ITA, Common::kPlatformPC, ADGF_CD, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_ITE, 0, @@ -487,7 +484,7 @@ static const SAGAGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_CD, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_ITE, 0, @@ -512,7 +509,7 @@ static const SAGAGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_CD, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_ITE, 0, @@ -539,7 +536,7 @@ static const SAGAGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GID_ITE, GF_ITE_FLOPPY, @@ -563,7 +560,7 @@ static const SAGAGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GID_ITE, GF_ITE_FLOPPY, @@ -587,7 +584,7 @@ static const SAGAGameDescription gameDescriptions[] = { Common::IT_ITA, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GID_ITE, GF_ITE_FLOPPY, @@ -620,7 +617,7 @@ static const SAGAGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_IHNM, 0, @@ -652,7 +649,7 @@ static const SAGAGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_IHNM, 0, @@ -682,7 +679,7 @@ static const SAGAGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_IHNM, 0, @@ -710,7 +707,7 @@ static const SAGAGameDescription gameDescriptions[] = { Common::ES_ESP, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_IHNM, 0, @@ -739,7 +736,7 @@ static const SAGAGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_IHNM, 0, @@ -767,7 +764,7 @@ static const SAGAGameDescription gameDescriptions[] = { Common::IT_ITA, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_IHNM, 0, @@ -792,7 +789,7 @@ static const SAGAGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformMacintosh, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_IHNM, 0, @@ -822,7 +819,7 @@ static const SAGAGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_DINO, 0, @@ -852,7 +849,7 @@ static const SAGAGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_FTA2, 0, 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"; diff --git a/engines/sci/detection_tables.h b/engines/sci/detection_tables.h index 56438b135d..4b1f36cda0 100644 --- a/engines/sci/detection_tables.h +++ b/engines/sci/detection_tables.h @@ -29,15 +29,11 @@ namespace Sci { {"sci-fanmade", name, { \ {"resource.map", 0, resMapMd5, resMapSize}, \ {"resource.001", 0, resMd5, resSize}, \ - AD_LISTEND}, lang, Common::kPlatformPC, 0, GUIO_NOSPEECH \ + AD_LISTEND}, lang, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) \ } #define FANMADE(name, resMapMd5, resMapSize, resMd5, resSize) FANMADE_L(name, resMapMd5, resMapSize, resMd5, resSize, Common::EN_ANY) -using Common::GUIO_NONE; -using Common::GUIO_NOSPEECH; -using Common::GUIO_MIDIGM; - // Game descriptions static const struct ADGameDescription SciGameDescriptions[] = { // Astro Chicken - English DOS @@ -46,7 +42,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "f3d1be7752d30ba60614533d531e2e98", 474}, {"resource.001", 0, "6fd05926c2199af0af6f72f90d0d7260", 126895}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Castle of Dr. Brain - English Amiga (from www.back2roots.org) // Executable scanning reports "1.005.000" @@ -58,7 +54,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.002", 0, "d226d7d3b4f77c4a566913fc310487fc", 792380}, {"resource.003", 0, "d226d7d3b4f77c4a566913fc310487fc", 464348}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO1(GUIO_NOSPEECH) }, // Castle of Dr. Brain - German Amiga (from www.back2roots.org, also includes English language) // Executable scanning reports "1.005.001" @@ -70,7 +66,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.002", 0, "85e51acb5f9c539d66e3c8fe40e17da5", 826309}, {"resource.003", 0, "85e51acb5f9c539d66e3c8fe40e17da5", 493638}, AD_LISTEND}, - Common::DE_DEU, Common::kPlatformAmiga, ADGF_ADDENGLISH, GUIO_NOSPEECH }, + Common::DE_DEU, Common::kPlatformAmiga, ADGF_ADDENGLISH, GUIO1(GUIO_NOSPEECH) }, // Castle of Dr. Brain Macintosh (from omer_mor, bug report #3328251) {"castlebrain", "", { @@ -80,7 +76,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.002", 0, "e1a6b6f1060f60be9dcb6d28ad7a2a20", 1168310}, {"resource.003", 0, "6c3d1bb26ad532c94046bc9ac49b5ff4", 891295}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformMacintosh, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformMacintosh, 0, GUIO1(GUIO_NOSPEECH) }, // Castle of Dr. Brain - English DOS Non-Interactive Demo // SCI interpreter version 1.000.005 @@ -89,7 +85,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.000", 0, "9780f040d58182994e22d2e34fab85b0", 67367}, {"resource.001", 0, "2af49dbd8f2e1db4ab09f9310dc91259", 570553}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO1(GUIO_NOSPEECH) }, // Castle of Dr. Brain - English DOS 5.25" Floppy EGA (from omer_mor, bug report #3035349) {"castlebrain", "EGA", { @@ -102,7 +98,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.005", 0, "8a5ed3ba96e2eaf18e36fedfaab89419", 297838}, {"resource.006", 0, "dceed92e709cad1bd9582809a235b0a0", 266682}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Castle of Dr. Brain - English DOS 3.5" Floppy EGA (from nozomi77, bug report #3405307) {"castlebrain", "EGA", { @@ -112,7 +108,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.002", 0, "de2f182529efaad2c4b510b452ab77ac", 633662}, {"resource.003", 0, "38b4b37febc6b4f5061c461a283df148", 430388}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Castle of Dr. Brain - English DOS Floppy (from jvprat) // Executable scanning reports "1.000.044", Floppy label reports "1.0, 10.30.91", VERSION file reports "1.000" @@ -123,7 +119,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.001", 0, "d2f5a1be74ed963fa849a76892be5290", 794832}, {"resource.002", 0, "c0c29c51af66d65cb53f49e785a2d978", 1280907}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Castle of Dr. Brain - English DOS Floppy 1.1 {"castlebrain", "", { @@ -132,7 +128,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.001", 0, "13e81e1839cd7b216d2bb5615c1ca160", 796776}, {"resource.002", 0, "930e416bec196b9703a331d81b3d66f2", 1283812}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Castle of Dr. Brain - English DOS Floppy 1.000 // Reported by graxer in bug report #3037942 @@ -147,7 +143,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.006", 0, "1d778a0c65cac9ddbab65495e50a94ee", 335281}, {"resource.007", 0, "063bb8ce4157c778cf30d1c912c006f1", 335631}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Castle of Dr. Brain - Spanish DOS (also includes english language) // SCI interpreter version 1.000.510 @@ -156,7 +152,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.000", 0, "27ec5fa09cd12a7fd16e86d96a2ed245", 1197694}, {"resource.001", 0, "735be4e58957180cfc807d5e18fdffcd", 1433302}, AD_LISTEND}, - Common::ES_ESP, Common::kPlatformPC, ADGF_ADDENGLISH, GUIO_NOSPEECH }, + Common::ES_ESP, Common::kPlatformPC, ADGF_ADDENGLISH, GUIO1(GUIO_NOSPEECH) }, // Christmas Card 1988 - English DOS // SCI interpreter version 0.000.294 @@ -164,7 +160,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "39485580d34a72997f3d5b3aba4d24f1", 426}, {"resource.001", 0, "11391434f41c834090d7a1e9488ce936", 129739}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Christmas Card 1990: The Seasoned Professional - English DOS (16 Colors) // SCI interpreter version 1.000.172 @@ -172,7 +168,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "8f656714a05b94423ac6eb10ee8797d0", 600}, {"resource.001", 0, "acde93e58fca4f7a2a5a220558a94aa8", 272629}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Christmas Card 1990: The Seasoned Professional - English DOS (256 Colors) // SCI interpreter version 1.000.174 @@ -180,7 +176,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "44b8f45b841b9b5e17e939a35e443988", 600}, {"resource.001", 0, "acde93e58fca4f7a2a5a220558a94aa8", 335362}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Christmas Card 1992 - English DOS // SCI interpreter version 1.001.055 @@ -188,7 +184,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "f1f8c8a8443f523422af70b4ec85b71c", 318}, {"resource.000", 0, "62fb9256f8e7e6e65a6875efdb7939ac", 203396}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Codename: Iceman - English Amiga (from www.back2roots.org) // Executable scanning reports "1.002.031" @@ -202,7 +198,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.004", 0, "8613c45fc771d658e5a505b9a4a54f31", 713382}, {"resource.005", 0, "605b67a9ef199a9bb015745e7c004cf4", 478384}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO1(GUIO_NOSPEECH) }, // Codename: Iceman - English DOS Non-Interactive Demo // Executable scanning reports "0.000.685" @@ -210,7 +206,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "782974f29d8a824782d2d4aea39964e3", 1056}, {"resource.001", 0, "d4b75e280d1c3a97cfef1b0bebff387c", 573647}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO1(GUIO_NOSPEECH) }, // Codename: Iceman - English DOS (from jvprat) // Executable scanning reports "0.000.685", Floppy label reports "1.033, 6.8.90", VERSION file reports "1.033" @@ -223,7 +219,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.003", 0, "d97a96f1ab91b41cf46a02cc89b0a04e", 624303}, {"resource.004", 0, "8613c45fc771d658e5a505b9a4a54f31", 670883}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Codename: Iceman - English DOS (from FRG) // SCI interpreter version 0.000.668 @@ -235,7 +231,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.003", 0, "dc7c5280e7acfaffe6ef2a6c963c5f94", 622118}, {"resource.004", 0, "64f342463f6f35ba71b3509ef696ae3f", 669188}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Codename: Iceman - English DOS (supplied by ssburnout in bug report #3049193) // 1.022 9x5.25" (label: Int#0.000.668) @@ -250,7 +246,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.006", 0, "08050329aa113a9f14ed99cbfe3536ec", 232942}, {"resource.007", 0, "64f342463f6f35ba71b3509ef696ae3f", 267811}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Codename: Iceman - English DOS 1.023 (from abevi, bug report #2612718) {"iceman", "", { @@ -264,7 +260,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.006", 0, "08050329aa113a9f14ed99cbfe3536ec", 232942}, {"resource.007", 0, "64f342463f6f35ba71b3509ef696ae3f", 267702}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Conquests of Camelot - English Amiga (from www.back2roots.org) // Executable scanning reports "1.002.030" @@ -279,7 +275,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.005", 0, "c6e551bdc24f0acc193159038d4ca767", 605882}, {"resource.006", 0, "8f880a536908ab496bbc552f7f5c3738", 585255}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO1(GUIO_NOSPEECH) }, // Conquests of Camelot - English DOS Non-Interactive Demo // SCI interpreter version 0.000.668 @@ -287,7 +283,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "f4cd75c15be75e04cdca3acda2c0b0ea", 468}, {"resource.001", 0, "4930708722f34bfbaa4945fb08f55f61", 232523}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO1(GUIO_NOSPEECH) }, // Conquests of Camelot - English DOS (from jvprat) // Executable scanning reports "0.000.685", Floppy label reports "1.001, 0.000.685", VERSION file reports "1.001.000" @@ -299,7 +295,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.003", 0, "8e1a3a8c588007404b532b8dfacc1460", 723712}, {"resource.004", 0, "8e1a3a8c588007404b532b8dfacc1460", 729143}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Conquests of Camelot - English DOS // SCI interpreter version 0.000.685 @@ -313,7 +309,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.006", 0, "8e1a3a8c588007404b532b8dfacc1460", 332446}, {"resource.007", 0, "8e1a3a8c588007404b532b8dfacc1460", 358182}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Conquests of the Longbow - English Amiga (from www.back2roots.org) // Executable scanning reports "1.005.001" @@ -328,7 +324,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.005", 0, "1c3804e56b114028c5873a35c2f06d13", 653002}, {"resource.006", 0, "f9487732289a4f4966b4e34eea413325", 842817}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO1(GUIO_NOSPEECH) }, // Conquests of the Longbow - English DOS // SCI interpreter version 1.000.510 @@ -342,7 +338,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.005", 0, "d036df0872f2db19bca34601276be2d7", 1154950}, {"resource.006", 0, "b367a6a59f29ee30dde1d88a5a41152d", 1042966}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Conquests of the Longbow - English DOS Floppy (from jvprat) // Executable scanning reports "1.000.168", Floppy label reports "1.1, 1.13.92", VERSION file reports "1.1" @@ -356,7 +352,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.004", 0, "9cfce07e204a329e94fda8b5657621da", 1261462}, {"resource.005", 0, "21ebe6b39b57a73fc449f67f013765aa", 1284720}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Conquests of the Longbow - English DOS // SCI interpreter version 1.000.510 @@ -369,7 +365,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.004", 0, "9cfce07e204a329e94fda8b5657621da", 1260237}, {"resource.005", 0, "21ebe6b39b57a73fc449f67f013765aa", 1284609}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Conquests of the Longbow EGA - English DOS // SCI interpreter version 1.000.510 @@ -382,7 +378,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.004", 0, "b7bb35c027bb424ecefcd122768e5e60", 705631}, {"resource.005", 0, "58942b1aa6d6ffeb66e9f8897fd4435f", 469243}, {"resource.006", 0, "8c767b3939add63d11274065e46aad04", 713158}, - AD_LISTEND}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + AD_LISTEND}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Conquests of the Longbow DOS 1.0 EGA (4 x 5.25" disks) // Provided by ssburnout in bug report #3046802 @@ -392,7 +388,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.001", 0, "76c729e563809170e6cc8b2f3f6cf0a4", 1196133}, {"resource.002", 0, "8c767b3939add63d11274065e46aad04", 1152478}, {"resource.003", 0, "7025b87e735b1df3f0e9488a621f4333", 1171439}, - AD_LISTEND}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + AD_LISTEND}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Conquests of the Longbow - English DOS Non-Interactive Demo // SCI interpreter version 1.000.510 @@ -400,7 +396,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "cbc5cb73341de1bff1b1e20a640af220", 588}, {"resource.001", 0, "f05a20cc07eee85da8e999d0ac0f596b", 869916}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO1(GUIO_NOSPEECH) }, // Conquests of the Longbow - German DOS (suplied by markcoolio in bug report #2727681, also includes english language) // SCI interpreter version 1.000.510 @@ -414,7 +410,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.005", 0, "d036df0872f2db19bca34601276be2d7", 1176914}, {"resource.006", 0, "b367a6a59f29ee30dde1d88a5a41152d", 1123585}, AD_LISTEND}, - Common::DE_DEU, Common::kPlatformPC, ADGF_ADDENGLISH, GUIO_NOSPEECH }, + Common::DE_DEU, Common::kPlatformPC, ADGF_ADDENGLISH, GUIO1(GUIO_NOSPEECH) }, // Eco Quest - English DOS Non-Interactive Demo (from FRG) // Executable scanning reports "x.yyy.zzz" @@ -423,7 +419,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "c819e171359b7c95f4c13b846d5c034e", 873}, {"resource.001", 0, "baf9393a9bfa73098adb501e5bc5487b", 657518}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO1(GUIO_NOSPEECH) }, // Eco Quest - English DOS CD 1.1 // SCI interpreter version 1.001.064 @@ -431,7 +427,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "a4b73d5d2b55bdb6e44345e99c8fbdd0", 4804}, {"resource.000", 0, "d908dbef56816ac6c60dd145fdeafb2b", 3536046}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_CD, GUIO_NONE }, + Common::EN_ANY, Common::kPlatformPC, ADGF_CD, GUIO1(GUIO_NONE) }, // Eco Quest - English DOS CD 1.1 // SCI interpreter version 1.001.064 @@ -441,7 +437,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "a4b73d5d2b55bdb6e44345e99c8fbdd0", 4804}, {"resource.000", 0, "d908dbef56816ac6c60dd145fdeafb2b", 3536046}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformWindows, ADGF_CD, GUIO_MIDIGM }, + Common::EN_ANY, Common::kPlatformWindows, ADGF_CD, GUIO1(GUIO_MIDIGM) }, // Eco Quest - English DOS Floppy // SCI interpreter version 1.000.510 @@ -452,7 +448,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.002", 0, "28fe9b4f0567e71feb198bc9f3a2c605", 1241816}, {"resource.003", 0, "f3146df0ad4297f5ce35aa8c4753bf6c", 586832}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Eco Quest - English DOS Floppy // SCI interpreter version 1.000.510 @@ -463,7 +459,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.002", 0, "323b3b12f43d53f27d259beb225f0aa7", 1129316}, {"resource.003", 0, "83ac03e4bddb2c1ac2d36d2a587d0536", 1145616}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Eco Quest - German DOS Floppy (supplied by markcoolio in bug report #2723744, also includes english language) // SCI interpreter version 1.000.510 @@ -474,7 +470,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.002", 0, "02d7d0411f7903aacb3bc8b0f8ca8a9a", 1202581}, {"resource.003", 0, "84dd11b6825255671c703aee5ceff620", 1175835}, AD_LISTEND}, - Common::DE_DEU, Common::kPlatformPC, ADGF_ADDENGLISH, GUIO_NOSPEECH }, + Common::DE_DEU, Common::kPlatformPC, ADGF_ADDENGLISH, GUIO1(GUIO_NOSPEECH) }, // Eco Quest - Spanish DOS Floppy (from jvprat, also includes english language) // Executable scanning reports "1.ECO.013", VERSION file reports "1.000, 11.12.92" @@ -486,7 +482,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.002", 0, "2d21a1d2dcbffa551552e3e0725d2284", 1186033}, {"resource.003", 0, "84dd11b6825255671c703aee5ceff620", 1174993}, AD_LISTEND}, - Common::ES_ESP, Common::kPlatformPC, ADGF_ADDENGLISH, GUIO_NOSPEECH }, + Common::ES_ESP, Common::kPlatformPC, ADGF_ADDENGLISH, GUIO1(GUIO_NOSPEECH) }, // Eco Quest - French DOS Floppy (from Strangerke, also includes english language) // SCI interpreter version 1.ECO.013 @@ -497,7 +493,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.002", 0, "b836c6ee9de67d814ac5d1b05f5b9858", 1173872}, {"resource.003", 0, "f8f767f9d6351432621c6e54c1b2ba8c", 1141520}, AD_LISTEND}, - Common::FR_FRA, Common::kPlatformPC, ADGF_ADDENGLISH, GUIO_NOSPEECH }, + Common::FR_FRA, Common::kPlatformPC, ADGF_ADDENGLISH, GUIO1(GUIO_NOSPEECH) }, // Eco Quest 2 - English DOS Non-Interactive Demo // SCI interpreter version 1.001.055 @@ -505,7 +501,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "607cfa0d8a03b7d348c06ee727e3d939", 1321}, {"resource.000", 0, "dd6f614c43c029f063e93cd243af90a4", 525992}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO1(GUIO_NOSPEECH) }, // Eco Quest 2 - English DOS Floppy (supplied by markcoolio in bug report #2723761) // SCI interpreter version 1.001.065 @@ -513,7 +509,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "28fb7b6abb9fc1cb8882d7c2e701b63f", 5658}, {"resource.000", 0, "cc1d17e5637528dbe4a812699e1cbfc6", 4208192}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Eco Quest 2 - French DOS Floppy (from Strangerke) // SCI interpreter version 1.001.081 @@ -521,7 +517,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "c22ab8b33c339c138b6b1697b77b9e79", 5588}, {"resource.000", 0, "1c4093f7248240329121fdf8c0d59152", 4231946}, AD_LISTEND}, - Common::FR_FRA, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::FR_FRA, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Eco Quest 2 - Spanish DOS Floppy (supplied by umbrio in bug report #3313962) {"ecoquest2", "Floppy", { @@ -529,7 +525,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.000", 0, "1c4093f7248240329121fdf8c0d59152", 4209150}, {"resource.msg", 0, "eff8be1925d42288de55e405983e9314", 117810}, AD_LISTEND}, - Common::ES_ESP, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::ES_ESP, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Freddy Pharkas - English DOS demo (from FRG) // SCI interpreter version 1.001.069 @@ -537,7 +533,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "97aa9fcfe84c9993a64debd28c32393a", 1909}, {"resource.000", 0, "5ea8e7a3ea10cce6efd5c106dc62fd8c", 867724}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO1(GUIO_NOSPEECH) }, // Freddy Pharkas - English CD DOS (from FRG) // SCI interpreter version 1.001.132 @@ -545,7 +541,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "d46b282f228a67ba13bd4b4009e95f8f", 6058}, {"resource.000", 0, "ee3c64ffff0ba9fb08bea2624631c598", 5490246}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_CD, GUIO_NONE }, + Common::EN_ANY, Common::kPlatformPC, ADGF_CD, GUIO1(GUIO_NONE) }, // Freddy Pharkas - English DOS Floppy (updated information from markcoolio in bug reports #2723773 and #2724720) // Executable scanning reports "1.cfs.081" @@ -555,7 +551,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.000", 0, "96b07e9b914dba1c8dc6c78a176326df", 5233230}, {"resource.msg", 0, "554f65315d851184f6e38211489fdd8f", -1}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Freddy Pharkas - Windows (supplied by abevi in bug report #2612718) // Executable scanning reports "1.cfs.081" @@ -564,7 +560,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "a32674e7fbf7b213b4a066c8037f16b6", 5816}, {"resource.000", 0, "fed4808fdb72486908ac7ad0044b14d8", 5233230}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformWindows, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformWindows, 0, GUIO1(GUIO_NOSPEECH) }, // Freddy Pharkas - German DOS Floppy (from Tobis87, updated information from markcoolio in bug reports #2723772 and #2724720) // Executable scanning reports "1.cfs.081" @@ -574,7 +570,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.000", 0, "96b07e9b914dba1c8dc6c78a176326df", 5233230}, {"resource.msg", 0, "304b5a5781800affd2235152a5794fa8", -1}, AD_LISTEND}, - Common::DE_DEU, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::DE_DEU, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Freddy Pharkas - Spanish DOS (from jvprat) // Executable scanning reports "1.cfs.081", VERSION file reports "1.000, March 30, 1995" @@ -587,7 +583,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.003", 0, "05acdc256c742e79c50b9fe7ec2cc898", 863310}, {"resource.msg", 0, "45b5bf74933ac3727e4cc844446dc052", 796156}, AD_LISTEND}, - Common::ES_ESP, Common::kPlatformPC, ADGF_CD, GUIO_NONE }, + Common::ES_ESP, Common::kPlatformPC, ADGF_CD, GUIO1(GUIO_NONE) }, // Freddy Pharkas - Spanish DOS (from jvprat) // Executable scanning reports "1.cfs.081", VERSION file reports "1.000, March 30, 1995" @@ -597,7 +593,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.000", 0, "96b07e9b914dba1c8dc6c78a176326df", 5233230}, {"resource.msg", 0, "45b5bf74933ac3727e4cc844446dc052", 796156}, AD_LISTEND}, - Common::ES_ESP, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::ES_ESP, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Freddy Pharkas - English DOS CD Demo // SCI interpreter version 1.001.095 @@ -605,14 +601,14 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "a62a7eae85dd1e6b07f39662b278437e", 1918}, {"resource.000", 0, "4962a3c4dd44e36e78ea4a7a374c2220", 957382}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NONE }, + Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO1(GUIO_NONE) }, // Freddy Pharkas - English Macintosh {"freddypharkas", "", { {"Data1", 0, "ef7cbd62727989818f1cfae69c9fd61d", 3038492}, {"Data2", 0, "2424b418f7d52c385cea4701f529c69a", 4721732}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformMacintosh, ADGF_MACRESFORK, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformMacintosh, ADGF_MACRESFORK, GUIO1(GUIO_NOSPEECH) }, // Fun Seeker's Guide - English DOS // SCI interpreter version 0.000.506 @@ -620,7 +616,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "7ee6859ef74314f6d91938c3595348a9", 282}, {"resource.001", 0, "f1e680095424e31f7fae1255d36bacba", 40692}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Gabriel Knight - English DOS CD Demo // SCI interpreter version 1.001.092 @@ -628,7 +624,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "39645952ae0ed8072c7e838f31b75464", 2490}, {"resource.000", 0, "eb3ed7477ca4110813fe1fcf35928561", 1718450}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NONE }, + Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO1(GUIO_NONE) }, #ifdef ENABLE_SCI32 // Gabriel Knight - English DOS Floppy @@ -637,7 +633,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "372d059f75856afa6d73dd84cbb8913d", 10783}, {"resource.000", 0, "69b7516962510f780d38519cc15fcc7c", 13022630}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, GUIO1(GUIO_NOSPEECH) }, // Gabriel Knight - English DOS Floppy (supplied my markcoolio in bug report #2723777) // SCI interpreter version 2.000.000 @@ -645,7 +641,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "65e8c14092e4c9b3b3538b7602c8c5ec", 10783}, {"resource.000", 0, "69b7516962510f780d38519cc15fcc7c", 13022630}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, GUIO1(GUIO_NOSPEECH) }, // Gabriel Knight - English DOS Floppy // SCI interpreter version 2.000.000, VERSION file reports "1.0\nGabriel Knight\n11/22/10:33 pm\n\x1A" @@ -653,7 +649,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "ef41df08cf2c1f680216cdbeed0f8311", 10783}, {"resource.000", 0, "69b7516962510f780d38519cc15fcc7c", 13022630}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, GUIO1(GUIO_NOSPEECH) }, // Gabriel Knight - German DOS Floppy (supplied my markcoolio in bug report #2723775) // SCI interpreter version 2.000.000 @@ -661,7 +657,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "ad6508b0296b25c07b1f58828dc33696", 10789}, {"resource.000", 0, "091cf08910780feabc56f8551b09cb36", 13077029}, AD_LISTEND}, - Common::DE_DEU, Common::kPlatformPC, ADGF_UNSTABLE, GUIO_NOSPEECH }, + Common::DE_DEU, Common::kPlatformPC, ADGF_UNSTABLE, GUIO1(GUIO_NOSPEECH) }, // Gabriel Knight - English DOS CD (from jvprat) // Executable scanning reports "2.000.000", VERSION file reports "01.100.000" @@ -669,7 +665,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "372d059f75856afa6d73dd84cbb8913d", 10996}, {"resource.000", 0, "69b7516962510f780d38519cc15fcc7c", 12581736}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_CD | ADGF_UNSTABLE, GUIO_NONE }, + Common::EN_ANY, Common::kPlatformPC, ADGF_CD | ADGF_UNSTABLE, GUIO1(GUIO_NONE) }, // Gabriel Knight - English Windows CD (from jvprat) // Executable scanning reports "2.000.000", VERSION file reports "01.100.000" @@ -677,7 +673,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "372d059f75856afa6d73dd84cbb8913d", 10996}, {"resource.000", 0, "69b7516962510f780d38519cc15fcc7c", 12581736}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformWindows, ADGF_CD | ADGF_UNSTABLE, GUIO_NONE }, + Common::EN_ANY, Common::kPlatformWindows, ADGF_CD | ADGF_UNSTABLE, GUIO1(GUIO_NONE) }, // Gabriel Knight - German DOS CD (from Tobis87) // SCI interpreter version 2.000.000 @@ -685,7 +681,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "a7d3e55114c65647310373cb390815ba", 11392}, {"resource.000", 0, "091cf08910780feabc56f8551b09cb36", 13400497}, AD_LISTEND}, - Common::DE_DEU, Common::kPlatformPC, ADGF_CD | ADGF_UNSTABLE, GUIO_NONE }, + Common::DE_DEU, Common::kPlatformPC, ADGF_CD | ADGF_UNSTABLE, GUIO1(GUIO_NONE) }, // Gabriel Knight - Spanish DOS CD (from jvprat) // Executable scanning reports "2.000.000", VERSION file reports "1.000.000, April 13, 1995" @@ -693,7 +689,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "7cb6e9bba15b544ec7a635c45bde9953", 11404}, {"resource.000", 0, "091cf08910780feabc56f8551b09cb36", 13381599}, AD_LISTEND}, - Common::ES_ESP, Common::kPlatformPC, ADGF_CD | ADGF_UNSTABLE, GUIO_NONE }, + Common::ES_ESP, Common::kPlatformPC, ADGF_CD | ADGF_UNSTABLE, GUIO1(GUIO_NONE) }, // Gabriel Knight - French DOS CD (from Hkz) // VERSION file reports "1.000.000, May 3, 1994" @@ -701,7 +697,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "55f909ba93a2515042a08d8a2da8414e", 11392}, {"resource.000", 0, "091cf08910780feabc56f8551b09cb36", 13325145}, AD_LISTEND}, - Common::FR_FRA, Common::kPlatformPC, ADGF_CD | ADGF_UNSTABLE, GUIO_NONE }, + Common::FR_FRA, Common::kPlatformPC, ADGF_CD | ADGF_UNSTABLE, GUIO1(GUIO_NONE) }, // Gabriel Knight - German Windows CD (from Tobis87) // SCI interpreter version 2.000.000 @@ -709,7 +705,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "a7d3e55114c65647310373cb390815ba", 11392}, {"resource.000", 0, "091cf08910780feabc56f8551b09cb36", 13400497}, AD_LISTEND}, - Common::DE_DEU, Common::kPlatformWindows, ADGF_CD | ADGF_UNSTABLE, GUIO_NONE }, + Common::DE_DEU, Common::kPlatformWindows, ADGF_CD | ADGF_UNSTABLE, GUIO1(GUIO_NONE) }, // Gabriel Knight - Spanish Windows CD (from jvprat) // Executable scanning reports "2.000.000", VERSION file reports "1.000.000, April 13, 1995" @@ -717,7 +713,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "7cb6e9bba15b544ec7a635c45bde9953", 11404}, {"resource.000", 0, "091cf08910780feabc56f8551b09cb36", 13381599}, AD_LISTEND}, - Common::ES_ESP, Common::kPlatformWindows, ADGF_CD | ADGF_UNSTABLE, GUIO_NONE }, + Common::ES_ESP, Common::kPlatformWindows, ADGF_CD | ADGF_UNSTABLE, GUIO1(GUIO_NONE) }, // Gabriel Knight - English Macintosh {"gk1", "", { @@ -726,7 +722,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"Data3", 0, "f25068b408b09275d8b698866462f578", 3677599}, {"Data4", 0, "1cceebbe411b26c860a74f91c337fdf3", 3230086}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformMacintosh, ADGF_MACRESFORK | ADGF_UNSTABLE, GUIO_NONE }, + Common::EN_ANY, Common::kPlatformMacintosh, ADGF_MACRESFORK | ADGF_UNSTABLE, GUIO1(GUIO_NONE) }, // Gabriel Knight 2 - English Windows Non-Interactive Demo // Executable scanning reports "2.100.002" @@ -734,7 +730,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "e0effce11c4908f4b91838741716c83d", 1351}, {"resource.000", 0, "d04cfc7f04b6f74d13025378be49ec2b", 4640330}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformWindows, ADGF_DEMO | ADGF_UNSTABLE, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformWindows, ADGF_DEMO | ADGF_UNSTABLE, GUIO1(GUIO_NOSPEECH) }, // Gabriel Knight 2 - English DOS (GOG version) - ressci.* merged in ressci.000 // using Enrico Rolfi's HD/DVD installer: http://gkpatches.vogons.zetafleet.com/ @@ -742,7 +738,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resmap.000", 0, "b996fa1e57389a1e179a00a0049de1f4", 8110}, {"ressci.000", 0, "a19fc3604c6e5407abcf03d59ee87217", 168522221}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, GUIO_NONE }, + Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, GUIO1(GUIO_NONE) }, // Gabriel Knight 2 - English DOS (from jvprat) // Executable scanning reports "2.100.002", VERSION file reports "1.1" @@ -760,7 +756,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resmap.006", 0, "ce9359037277b7d7976da185c2fa0aad", 2977}, {"ressci.006", 0, "8e44e03890205a7be12f45aaba9644b4", 60659424}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, GUIO_NONE }, + Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, GUIO1(GUIO_NONE) }, // Gabriel Knight 2 - French DOS (6-CDs Sierra Originals reedition) // Executable scanning reports "2.100.002", VERSION file reports "1.0" @@ -778,7 +774,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resmap.006", 0, "11b2e722170b8c93fdaa5428e2c7676f", 3001}, {"ressci.006", 0, "4037d941aec39d2e654e20960429aefc", 60568486}, AD_LISTEND}, - Common::FR_FRA, Common::kPlatformPC, ADGF_UNSTABLE, GUIO_NONE }, + Common::FR_FRA, Common::kPlatformPC, ADGF_UNSTABLE, GUIO1(GUIO_NONE) }, // Gabriel Knight 2 - English Macintosh // NOTE: This only contains disc 1 files (as well as the persistent file: @@ -790,7 +786,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"Data4", 0, "8b843c62eb53136a855d6e0087e3cb0d", 5889553}, {"Data5", 0, "f9fcf9ab2eb13b2125c33a1cda03a093", 14349984}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformMacintosh, ADGF_MACRESFORK | ADGF_UNSTABLE, GUIO_NONE }, + Common::EN_ANY, Common::kPlatformMacintosh, ADGF_MACRESFORK | ADGF_UNSTABLE, GUIO1(GUIO_NONE) }, #endif // ENABLE_SCI32 @@ -802,7 +798,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.002", 0, "e0dd44069a62a463fd124974b915f10d", 342149}, {"resource.003", 0, "e0dd44069a62a463fd124974b915f10d", 328925}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Hoyle 1 - English DOS (supplied by wibble92 in bug report #2644547) // SCI interpreter version 0.000.530 @@ -812,7 +808,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.002", 0, "e0dd44069a62a463fd124974b915f10d", 342309}, {"resource.003", 0, "e0dd44069a62a463fd124974b915f10d", 328912}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Hoyle 1 - English DOS (supplied by merkur in bug report #2719227) // SCI interpreter version 0.000.530 @@ -820,14 +816,14 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "1034a218943d12f1f36e753fa10c95b8", 4386}, {"resource.001", 0, "e0dd44069a62a463fd124974b915f10d", 518308}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Hoyle 1 3.5' - English DOS (supplied by eddydrama in bug report #3052366 and dinnerx in bug report #3090841) {"hoyle1", "", { {"resource.map", 0, "0af9a3dcd72a091960de070432e1f524", 4386}, {"resource.001", 0, "e0dd44069a62a463fd124974b915f10d", 518127}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, #if 0 // TODO: unknown if these files are corrupt // Hoyle 1 - English Amiga (from www.back2roots.org) @@ -837,7 +833,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.001", 0, "e0dd44069a62a463fd124974b915f10d", 218755}, {"resource.002", 0, "e0dd44069a62a463fd124974b915f10d", 439502}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO1(GUIO_NOSPEECH) }, #endif // Hoyle 2 - English DOS @@ -847,7 +843,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.001", 0, "8f2dd70abe01112eca464cda818b5eb6", 98138}, {"resource.002", 0, "8f2dd70abe01112eca464cda818b5eb6", 196631}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Hoyle 2 - English DOS (supplied by ssburnout in bug report #3049193) // 1.000.011 1x3.5" (label:Int#6.21.90) @@ -855,7 +851,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "db0ba08b953e9904a4960ad99cd29c20", 1356}, {"resource.001", 0, "8f2dd70abe01112eca464cda818b5eb6", 216315}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Hoyle 2 - English Amiga (from www.back2roots.org) // Executable scanning reports "1.002.032" @@ -864,7 +860,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "62ed48d20c580e5a98f102f7cd93706a", 1356}, {"resource.001", 0, "8f2dd70abe01112eca464cda818b5eb6", 222704}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO1(GUIO_NOSPEECH) }, // Hoyle 2 - English Macintosh // Executable scanning reports "x.yyy.zzz" @@ -872,7 +868,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "1af1d3aa3cf564f93477c9f87e53f495", 1728}, {"resource.001", 0, "b73b8131669d69d41a326415e4519138", 482882}, {NULL, 0, NULL, 0}}, - Common::EN_ANY, Common::kPlatformMacintosh, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformMacintosh, 0, GUIO1(GUIO_NOSPEECH) }, #if 0 // TODO: unknown if these files are corrupt // Hoyle 3 - English Amiga (from www.back2roots.org) @@ -883,7 +879,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.000", 0, "595b6039ea1356e7f96a52c58eedcf22", 355791}, {"resource.001", 0, "143df8aef214a2db34c2d48190742012", 632273}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO1(GUIO_NOSPEECH) }, #endif // Hoyle 3 - English DOS Non-Interactive Demo @@ -893,7 +889,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "0d06cacc87dc21a08cd017e73036f905", 735}, {"resource.001", 0, "24db2bccda0a3c43ac4a7b5edb116c7e", 797678}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO1(GUIO_NOSPEECH) }, // Hoyle 3 - English DOS Floppy (from jvprat) // Executable scanning reports "x.yyy.zzz", Floppy label reports "1.0, 11.2.91", VERSION file reports "1.000" @@ -903,7 +899,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.000", 0, "6ef28cac094dcd97fdb461662ead6f92", 541845}, {"resource.001", 0, "0a98a268ee99b92c233a0d7187c1f0fa", 845795}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Hoyle 3 - English DOS Floppy (supplied by eddydrama in bug report #3038837) {"hoyle3", "", { @@ -914,7 +910,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.003", 0, "97cfd72633f8f9b2a0b1d4116cf3ee81", 346116}, {"resource.004", 0, "2884fb91b225fabd9ca87ea231293b48", 351218}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Hoyle 3 EGA - English DOS Floppy 1.0 (supplied by abevi in bug report #2612718) {"hoyle3", "EGA", { @@ -922,14 +918,14 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.000", 0, "6ef28cac094dcd97fdb461662ead6f92", 319905}, {"resource.001", 0, "0a98a268ee99b92c233a0d7187c1f0fa", 526438}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Hoyle 4 (Hoyle Classic Card Games) - English DOS Demo {"hoyle4", "Demo", { {"resource.map", 0, "60f764020a6b788bbbe415dbc2ccb9f3", 931}, {"resource.000", 0, "5fe3670e3ddcd4f85c10013b5453141a", 615522}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO1(GUIO_NOSPEECH) }, // Hoyle 4 (Hoyle Classic Card Games) - English DOS Demo // SCI interpreter version 1.001.200 (just a guess) @@ -938,7 +934,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "662087cb383e52e3cc4ae7ecb10e20aa", 938}, {"resource.000", 0, "24c10844792c54d476d272213cbac300", 675252}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO1(GUIO_NOSPEECH) }, // Hoyle 4 (Hoyle Classic Card Games) - English DOS/Win // Supplied by abevi in bug report #3039291 @@ -946,7 +942,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "2b577c975cc8d8d43f61b6a756129fe3", 4352}, {"resource.000", 0, "43e2c15ce436aab611a462ad0603e12d", 2000132}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Hoyle 4 (Hoyle Classic Card Games) - English Macintosh Floppy // VERSION file reports "2.0" @@ -954,7 +950,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"Data1", 0, "99575fae4579540a314bbedd72d51e8c", 7682887}, {"Data2", 0, "7d4bf5bdf3c02edbf35cb8471c84ec13", 1539134}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformMacintosh, ADGF_MACRESFORK, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformMacintosh, ADGF_MACRESFORK, GUIO1(GUIO_NOSPEECH) }, // Jones in the Fast Lane EGA - English DOS // SCI interpreter version 1.000.172 (not 100% sure FIXME) @@ -963,14 +959,14 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.001", 0, "bac3ec6cb3e3920984ab0f32becf5163", 202105}, {"resource.002", 0, "b86daa3ba2784d1502da881eedb80d9b", 341771}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Jones in the Fast Lane EGA - English DOS (supplied by EddyDrama in bug report #3038761) {"jones", "EGA", { {"resource.map", 0, "8e92cf319180cc8b5b87b2ce93a4fe22", 1602}, {"resource.001", 0, "bac3ec6cb3e3920984ab0f32becf5163", 511528}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Jones in the Fast Lane VGA - English DOS // SCI interpreter version 1.000.172 @@ -979,7 +975,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.001", 0, "bac3ec6cb3e3920984ab0f32becf5163", 313476}, {"resource.002", 0, "b86daa3ba2784d1502da881eedb80d9b", 719747}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Jones in the Fast Lane VGA - English DOS (supplied by omer_mor in bug report #3037054) // VERSION file reports "1.000.060" @@ -987,14 +983,14 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "db175ab494ab0666f19ab8f2597a8e49", 1602}, {"resource.001", 0, "bac3ec6cb3e3920984ab0f32becf5163", 994487}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Jones in the Fast Lane - English DOS CD {"jones", "CD", { {"resource.map", 0, "459f5b04467bc2107aec02f5c4b71b37", 4878}, {"resource.001", 0, "3876da2ce16fb7dea2f5d943d946fa84", 1652150}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_CD, GUIO_NONE }, + Common::EN_ANY, Common::kPlatformPC, ADGF_CD, GUIO1(GUIO_NONE) }, // Jones in the Fast Lane - English DOS CD // Same entry as the DOS version above. This one is used for the alternate @@ -1003,7 +999,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "459f5b04467bc2107aec02f5c4b71b37", 4878}, {"resource.001", 0, "3876da2ce16fb7dea2f5d943d946fa84", 1652150}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformWindows, ADGF_CD, GUIO_MIDIGM }, + Common::EN_ANY, Common::kPlatformWindows, ADGF_CD, GUIO1(GUIO_MIDIGM) }, // King's Quest 1 SCI Remake - English Amiga (from www.back2roots.org) // Executable scanning reports "1.003.007" @@ -1015,7 +1011,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.003", 0, "9ae2a13708d691cd42f9129173c4b39d", 763224}, {"resource.004", 0, "9ae2a13708d691cd42f9129173c4b39d", 820443}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO1(GUIO_NOSPEECH) }, // King's Quest 1 SCI Remake - English DOS Non-Interactive Demo // Executable scanning reports "S.old.010" @@ -1023,7 +1019,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "59b13619078bd47011421468959ee5d4", 954}, {"resource.001", 0, "4cfb9040db152868f7cb6a1e8151c910", 296555}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO1(GUIO_NOSPEECH) }, // King's Quest 1 SCI Remake - English DOS (from the King's Quest Collection) // Executable scanning reports "S.old.010", VERSION file reports "1.000.051" @@ -1034,7 +1030,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.002", 0, "fed9e0072ffd511d248674e60dee2099", 714062}, {"resource.003", 0, "fed9e0072ffd511d248674e60dee2099", 717478}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // King's Quest 1 SCI Remake - English DOS (supplied by ssburnout in bug report #3049193) // 1.000.051 9x5.25" (label: INT#9.19.90) @@ -1048,7 +1044,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.006", 0, "fed9e0072ffd511d248674e60dee2099", 351062}, {"resource.007", 0, "fed9e0072ffd511d248674e60dee2099", 330472}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // King's Quest 4 - English Amiga (from www.back2roots.org) // Executable scanning reports "1.002.032" @@ -1061,7 +1057,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.003", 0, "fd16c9c223f7dc5b65f06447615224ff", 683016}, {"resource.004", 0, "3fac034c7d130e055d05bc43a1f8d5f8", 549993}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO1(GUIO_NOSPEECH) }, // King's Quest 4 - English DOS Non-Interactive Demo // Executable scanning reports "0.000.494" @@ -1069,7 +1065,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "992ac7cc31d3717fe53818a9bb6d1dae", 594}, {"resource.001", 0, "143e1c14f15ad0fbfc714f648a65f661", 205330}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO1(GUIO_NOSPEECH) }, // King's Quest 4 - English DOS (original boxed release, 3 1/2" disks) // SCI interpreter version 0.000.247 @@ -1080,7 +1076,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.003", 0, "851a62d00972dc4002f472cc0d84e71d", 683145}, {"resource.004", 0, "851a62d00972dc4002f472cc0d84e71d", 649441}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // King's Quest 4 - English DOS (from the King's Quest Collection) // Executable scanning reports "0.000.502" @@ -1092,7 +1088,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.003", 0, "77615c595388acf3d1df8e107bfb6b52", 707591}, {"resource.004", 0, "77615c595388acf3d1df8e107bfb6b52", 479562}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // King's Quest 4 - English DOS (supplied by ssburnout in bug report #3049193) // 1.006.003 8x5.25" (label: Int.#0.000.502) @@ -1106,7 +1102,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.006", 0, "6db7de6f93c6ea62dca78abee677f8c0", 324789}, {"resource.007", 0, "6db7de6f93c6ea62dca78abee677f8c0", 334441}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // King's Quest 4 - English DOS // SCI interpreter version 0.000.274 @@ -1120,7 +1116,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.006", 0, "851a62d00972dc4002f472cc0d84e71d", 333777}, {"resource.007", 0, "851a62d00972dc4002f472cc0d84e71d", 341038}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // King's Quest 4 - English DOS // SCI interpreter version 0.000.253 @@ -1134,7 +1130,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.006", 0, "0c8566848a76eea19a6d6220914030a7", 337288}, {"resource.007", 0, "0c8566848a76eea19a6d6220914030a7", 343882}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // King's Quest 4 - English Atari ST (double-sided diskettes) // Game version 1.003.006 (January 12, 1989) @@ -1147,7 +1143,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.003", 0, "a3cdb4848fb859fdd302976fff56490f", 705074}, {"resource.004", 0, "a3cdb4848fb859fdd302976fff56490f", 478366}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformAtariST, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformAtariST, 0, GUIO1(GUIO_NOSPEECH) }, // King's Quest 5 - English Amiga (from www.back2roots.org) // Executable scanning reports "1.004.018" @@ -1163,7 +1159,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.006", 0, "26c0c25399b6715fec03fc3e12544fe3", 823048}, {"resource.007", 0, "b914b5901e786327213e779725d30dd1", 778772}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO1(GUIO_NOSPEECH) }, // King's Quest 5 - German Amiga (also includes english language) // Executable scanning reports "1.004.024" @@ -1179,7 +1175,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.006", 0, "56546b20db11a4836f900efa6d3a3e74", 672099}, {"resource.007", 0, "56546b20db11a4836f900efa6d3a3e74", 794194}, AD_LISTEND}, - Common::DE_DEU, Common::kPlatformAmiga, ADGF_ADDENGLISH, GUIO_NOSPEECH }, + Common::DE_DEU, Common::kPlatformAmiga, ADGF_ADDENGLISH, GUIO1(GUIO_NOSPEECH) }, // King's Quest 5 - Italian Amiga (also includes english language) // Executable scanning reports "1.004.024" @@ -1195,7 +1191,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.006", 0, "11cb750f5f816445ad0f4b9f50a4f59a", 672527}, {"resource.007", 0, "11cb750f5f816445ad0f4b9f50a4f59a", 794259}, AD_LISTEND}, - Common::IT_ITA, Common::kPlatformAmiga, ADGF_ADDENGLISH, GUIO_NOSPEECH }, + Common::IT_ITA, Common::kPlatformAmiga, ADGF_ADDENGLISH, GUIO1(GUIO_NOSPEECH) }, // King's Quest 5 - English DOS CD (from the King's Quest Collection) // Executable scanning reports "x.yyy.zzz", VERSION file reports "1.000.052" @@ -1205,7 +1201,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.000", 0, "449471bfd77be52f18a3773c7f7d843d", 571368}, {"resource.001", 0, "b45a581ff8751e052c7e364f58d3617f", 16800210}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_CD, GUIO_NONE }, + Common::EN_ANY, Common::kPlatformPC, ADGF_CD, GUIO1(GUIO_NONE) }, // King's Quest 5 - English DOS CD (from the King's Quest Collection) // Executable scanning reports "x.yyy.zzz", VERSION file reports "1.000.052" @@ -1217,7 +1213,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.000", 0, "449471bfd77be52f18a3773c7f7d843d", 571368}, {"resource.001", 0, "b45a581ff8751e052c7e364f58d3617f", 16800210}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformWindows, ADGF_CD, GUIO_MIDIGM }, + Common::EN_ANY, Common::kPlatformWindows, ADGF_CD, GUIO1(GUIO_MIDIGM) }, // King's Quest 5 - English DOS Floppy // SCI interpreter version 1.000.060 @@ -1232,7 +1228,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.006", 0, "672ede1136e9e401658538e51bd5dc22", 1172619}, {"resource.007", 0, "2f48faf27666b58c276dda20f91f4a93", 1240456}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // King's Quest 5 - English DOS Floppy (supplied by omer_mor in bug report #3036996) // VERSION file reports "0.000.051" @@ -1247,7 +1243,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.006", 0, "06cb3f689836086ebe08b1efc0126592", 921113}, {"resource.007", 0, "252249753c6e850eacceb8af634986d3", 1133608}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // King's Quest 5 EGA (supplied by markcoolio in bug report #2829470) // SCI interpreter version 1.000.060 @@ -1263,7 +1259,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.006", 0, "698c698570cde9015e4d51eb8d2e9db1", 666527}, {"resource.007", 0, "703d8df30e89541af337d7706540d5c4", 541743}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // King's Quest 5 EGA 1.2M disk version (from LordHoto) // VERSION file reports "0.000.055" @@ -1275,7 +1271,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "53206afb4fd73871a484e83acab80f31", 7608}, {"resource.004", 0, "83568edf7fde18b3eed988bc5d22ceb1", 1188053}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // King's Quest 5 EGA (supplied by omer_mor in bug report #3035421) // VERSION file reports "0.000.062" @@ -1290,7 +1286,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.006", 0, "698c698570cde9015e4d51eb8d2e9db1", 666541}, {"resource.007", 0, "703d8df30e89541af337d7706540d5c4", 541762}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // King's Quest V DOS 0.000.062 EGA (5 x 5.25" disks) // Supplied by ssburnout in bug report #3046780 @@ -1302,7 +1298,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.003", 0, "3cca5b2dae8afe94532edfdc98d7edbe", 1092325}, {"resource.004", 0, "8e5c1bc4d738cf7316ff506f59d265e2", 1187803}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // King's Quest 5 - German DOS Floppy (supplied by markcoolio in bug report #2727101, also includes english language) // SCI interpreter version 1.000.060 @@ -1317,7 +1313,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.006", 0, "d1a75fdc01840664d00366cff6919366", 1208972}, {"resource.007", 0, "c07494f0cce7c05210893938786a955b", 1337361}, AD_LISTEND}, - Common::DE_DEU, Common::kPlatformPC, ADGF_ADDENGLISH, GUIO_NOSPEECH }, + Common::DE_DEU, Common::kPlatformPC, ADGF_ADDENGLISH, GUIO1(GUIO_NOSPEECH) }, // King's Quest 5 - French DOS Floppy (from the King's Quest Collector's Edition 1994, also includes english language) // Supplied by aroenai in bug report #2812611 @@ -1333,7 +1329,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.006", 0, "f7dc85307632ef657ceb1651204f6f51", 1210081}, {"resource.007", 0, "7db4d0a1d8d547c0019cb7d2a6acbdd4", 1338473}, AD_LISTEND}, - Common::FR_FRA, Common::kPlatformPC, ADGF_ADDENGLISH, GUIO_NOSPEECH }, + Common::FR_FRA, Common::kPlatformPC, ADGF_ADDENGLISH, GUIO1(GUIO_NOSPEECH) }, // King's Quest 5 - Italian DOS Floppy (from glorifindel, includes english language) // SCI interpreter version 1.000.060 @@ -1348,7 +1344,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.006", 0, "8eeabd92af71e766e323db2100879102", 1209325}, {"resource.007", 0, "dc10c107e0923b902326a040b9c166b9", 1337859}, AD_LISTEND}, - Common::IT_ITA, Common::kPlatformPC, ADGF_ADDENGLISH, GUIO_NOSPEECH }, + Common::IT_ITA, Common::kPlatformPC, ADGF_ADDENGLISH, GUIO1(GUIO_NOSPEECH) }, // King's Quest 5 - Polish DOS Floppy (supplied by jacek909 in bug report #2725722, includes english language?!) // SCI interpreter version 1.000.060 @@ -1363,7 +1359,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.006", 0, "da82e4beb744731d0a151f1d4922fafa", 1170456}, {"resource.007", 0, "431def14ca29cdb5e6a5e84d3f38f679", 1240176}, AD_LISTEND}, - Common::PL_POL, Common::kPlatformPC, ADGF_ADDENGLISH, GUIO_NOSPEECH }, + Common::PL_POL, Common::kPlatformPC, ADGF_ADDENGLISH, GUIO1(GUIO_NOSPEECH) }, // King's Quest 5 - English Macintosh // VERSION file reports "1.000.055" @@ -1378,7 +1374,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.006", 0, "3d22904a374c192f51e5665b74364133", 1264079}, {"resource.007", 0, "ffe17e23d5833a79f3695addfc149a56", 1361965}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformMacintosh, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformMacintosh, 0, GUIO1(GUIO_NOSPEECH) }, // King's Quest 5 - FM-Towns (supplied by abevi in bug report #3038720) {"kq5", "", { @@ -1386,7 +1382,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.000", 0, "71afd220d46bde1109c58e6acc0f3a01", 469094}, {"resource.001", 0, "72a569f46f1abf2d9d2b1526ad3799c3", 12808839}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformFMTowns, 0, GUIO_NONE }, + Common::EN_ANY, Common::kPlatformFMTowns, 0, GUIO1(GUIO_NONE) }, // King's Quest 5 - Japanese PC-98 Floppy 0.000.015 (supplied by omer_mor in bug report #3073583) {"kq5", "", { @@ -1398,7 +1394,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.004", 0, "e114ce8f884601c43308fb5cbbea4874", 1174129}, {"resource.005", 0, "349ad9438172265d00680075c5a988d0", 1019669}, AD_LISTEND}, - Common::JA_JPN, Common::kPlatformPC98, ADGF_ADDENGLISH, GUIO_NOSPEECH }, + Common::JA_JPN, Common::kPlatformPC98, ADGF_ADDENGLISH, GUIO1(GUIO_NOSPEECH) }, // King's Quest 6 - English DOS Non-Interactive Demo // Executable scanning reports "1.001.055", VERSION file reports "1.000.000" @@ -1408,7 +1404,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.000", 0, "535b1b920441ec73f42eaa4ccfd47b89", 264116}, {"resource.msg", 0, "54d1fdc936f98c81f9e4c19e04fb1510", 8260}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO1(GUIO_NOSPEECH) }, // King's Quest 6 - English DOS Floppy // SCI interpreter version 1.001.054 @@ -1417,7 +1413,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.000", 0, "f2b7f753992c56a0c7a08d6a5077c895", 7863324}, {"resource.msg", 0, "3cf5de44de36191f109d425b8450efc8", 258590}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // King's Quest 6 - German DOS Floppy (supplied by markcoolio in bug report #2727156) // SCI interpreter version 1.001.054 @@ -1426,7 +1422,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.000", 0, "f2b7f753992c56a0c7a08d6a5077c895", 7863324}, {"resource.msg", 0, "756297b2155db9e43f621c6f6fb763c3", 282822}, AD_LISTEND}, - Common::DE_DEU, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::DE_DEU, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // King's Quest 6 - English DOS CD (from the King's Quest Collection) // Executable scanning reports "1.cfs.158", VERSION file reports "1.034 9/11/94 - KQ6 version 1.000.00G" @@ -1435,7 +1431,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "7a550ebfeae2575ca00d47703a6a774c", 9215}, {"resource.000", 0, "233394a5f33b475ae5975e7e9a420865", 8376352}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_CD, GUIO_NONE }, + Common::EN_ANY, Common::kPlatformPC, ADGF_CD, GUIO1(GUIO_NONE) }, // King's Quest 6 - English Windows CD (from the King's Quest Collection) // Executable scanning reports "1.cfs.158", VERSION file reports "1.034 9/11/94 - KQ6 version 1.000.00G" @@ -1444,7 +1440,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "7a550ebfeae2575ca00d47703a6a774c", 9215}, {"resource.000", 0, "233394a5f33b475ae5975e7e9a420865", 8376352}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformWindows, ADGF_CD, GUIO_NONE }, + Common::EN_ANY, Common::kPlatformWindows, ADGF_CD, GUIO1(GUIO_NONE) }, // King's Quest 6 - Spanish DOS CD (from jvprat) // Executable scanning reports "1.cfs.158", VERSION file reports "1.000.000, July 5, 1994" @@ -1454,7 +1450,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.000", 0, "4da3ad5868a775549a7cc4f72770a58e", 8537260}, {"resource.msg", 0, "41eed2d3893e1ca6c3695deba4e9d2e8", 267102}, AD_LISTEND}, - Common::ES_ESP, Common::kPlatformPC, ADGF_CD, GUIO_NONE }, + Common::ES_ESP, Common::kPlatformPC, ADGF_CD, GUIO1(GUIO_NONE) }, // King's Quest 6 - English Macintosh Floppy // VERSION file reports "1.0" @@ -1462,7 +1458,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"Data1", 0, "a183fc0c22fcbd9be4c8800d974b5599", 3892124}, {"Data2", 0, "b3722460dfd3097a1fbaf99a21ad8ea5", 15031272}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformMacintosh, ADGF_MACRESFORK, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformMacintosh, ADGF_MACRESFORK, GUIO1(GUIO_NOSPEECH) }, #ifdef ENABLE_SCI32 @@ -1473,7 +1469,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.000", 0, "4948e4e1506f1e1c4e1d47abfa06b7f8", 204385195}, {"resource.map", 0, "40ccafb2195301504eba2e4f4f2c7f3d", 18925}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE, GUIO1(GUIO_NOSPEECH) }, // King's Quest 7 - English Windows (from the King's Quest Collection) // Executable scanning reports "2.100.002", VERSION file reports "1.4" @@ -1481,7 +1477,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "2be9ab94429c721af8e05c507e048a15", 18697}, {"resource.000", 0, "eb63ea3a2c2469dc2d777d351c626404", 203882535}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE, GUIO1(GUIO_NOSPEECH) }, // King's Quest 7 - English DOS (from FRG) // SCI interpreter version 2.100.002, VERSION file reports "2.00b" @@ -1489,7 +1485,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "8676b0fbbd7362989a029fe72fea14c6", 18709}, {"resource.000", 0, "51c1ead1163e19a2de8f121c39df7a76", 200764100}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, GUIO1(GUIO_NOSPEECH) }, // King's Quest 7 - English Windows (from FRG) // SCI interpreter version 2.100.002, VERSION file reports "2.00b" @@ -1497,7 +1493,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "8676b0fbbd7362989a029fe72fea14c6", 18709}, {"resource.000", 0, "51c1ead1163e19a2de8f121c39df7a76", 200764100}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE, GUIO1(GUIO_NOSPEECH) }, // King's Quest 7 - German Windows (supplied by markcoolio in bug report #2727402) // SCI interpreter version 2.100.002 @@ -1505,7 +1501,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "838b9ff132bd6962026fee832e8a7ddb", 18697}, {"resource.000", 0, "eb63ea3a2c2469dc2d777d351c626404", 206626576}, AD_LISTEND}, - Common::DE_DEU, Common::kPlatformPC, ADGF_UNSTABLE, GUIO_NOSPEECH }, + Common::DE_DEU, Common::kPlatformPC, ADGF_UNSTABLE, GUIO1(GUIO_NOSPEECH) }, // King's Quest 7 - Spanish DOS (from jvprat) // Executable scanning reports "2.100.002", VERSION file reports "2.00" @@ -1513,7 +1509,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "0b62693cbe87e3aaca3e8655a437f27f", 18709}, {"resource.000", 0, "51c1ead1163e19a2de8f121c39df7a76", 200764100}, AD_LISTEND}, - Common::ES_ESP, Common::kPlatformPC, ADGF_UNSTABLE, GUIO_NOSPEECH }, + Common::ES_ESP, Common::kPlatformPC, ADGF_UNSTABLE, GUIO1(GUIO_NOSPEECH) }, // King's Quest 7 - English DOS Non-Interactive Demo // SCI interpreter version 2.100.002 @@ -1521,7 +1517,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "b44f774108d63faa1d021101221c5a54", 1690}, {"resource.000", 0, "d9659d2cf0c269c6a9dc776707f5bea0", 2433827}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO | ADGF_UNSTABLE, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO | ADGF_UNSTABLE, GUIO1(GUIO_NOSPEECH) }, #endif // ENABLE_SCI32 @@ -1537,7 +1533,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.004", 0, "aa553977f7e5804081de293800d3bcce", 695067}, {"resource.005", 0, "bfd870d51dc97729f0914095f58e6957", 676881}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO1(GUIO_NOSPEECH) }, // Laura Bow - English Atari ST (from jvprat) // Executable scanning reports "1.002.030", Floppy label reports "1.000.062, 9.23.90" @@ -1549,7 +1545,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.003", 0, "e45c888d9c7c04aec0a20e9f820b79ff", 667365}, {"resource.004", 0, "e45c888d9c7c04aec0a20e9f820b79ff", 683737}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformAtariST, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformAtariST, 0, GUIO1(GUIO_NOSPEECH) }, // Laura Bow - English DOS Non-Interactive Demo // Executable scanning reports "x.yyy.zzz" @@ -1557,7 +1553,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "e625726268ff4e123ada11f31f0249f3", 768}, {"resource.001", 0, "0c8912290af0890f8d95faeb4ddb2d68", 333031}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO1(GUIO_NOSPEECH) }, // Laura Bow - English DOS 3.5" Floppy (from "The Roberta Williams Anthology"/1996) // SCI interpreter version 0.000.631 @@ -1568,7 +1564,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.003", 0, "e45c888d9c7c04aec0a20e9f820b79ff", 667468}, {"resource.004", 0, "e45c888d9c7c04aec0a20e9f820b79ff", 683807}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Laura Bow - English DOS (from FRG) // SCI interpreter version 0.000.631 @@ -1582,7 +1578,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.006", 0, "e45c888d9c7c04aec0a20e9f820b79ff", 328390}, {"resource.007", 0, "e45c888d9c7c04aec0a20e9f820b79ff", 317687}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Laura Bow 2 - English DOS Non-Interactive Demo (from FRG) // Executable scanning reports "x.yyy.zzz" @@ -1591,7 +1587,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "24dffc5db1d88c7999f13e8767ed7346", 855}, {"resource.000", 0, "2b2b1b4f7584f9b38fd13f6ab95634d1", 781912}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO1(GUIO_NOSPEECH) }, // Laura Bow 2 - English DOS Floppy // Executable scanning reports "2.000.274" @@ -1600,7 +1596,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "610bfd9a852004222f0faaf5fc9e630a", 6489}, {"resource.000", 0, "57084910bc923bff5d6d9bc1b56e9604", 5035964}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Laura Bow 2 - English DOS CD (from "The Roberta Williams Antology"/1996) // Executable scanning reports "1.001.072", VERSION file reports "1.1" (from jvprat) @@ -1609,7 +1605,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "a70945e61ba7ac7bfea6b7bd72c6aec5", 7274}, {"resource.000", 0, "82578b8d5a7e09c4c58891ca49fae35b", 5598672}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_CD, GUIO_NONE }, + Common::EN_ANY, Common::kPlatformPC, ADGF_CD, GUIO1(GUIO_NONE) }, // Laura Bow 2 v1.1 - French DOS Floppy (from Hkz) {"laurabow2", "", { @@ -1617,7 +1613,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.000", 0, "57084910bc923bff5d6d9bc1b56e9604", 5028766}, {"resource.msg", 0, "0fceedfbdd85a4bc7851fdd9dd2d2f19", 278253}, AD_LISTEND}, - Common::FR_FRA, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::FR_FRA, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Laura Bow 2 v1.1 - German DOS Floppy (from Tobis87, updated info from markcoolio in bug report #2723787, updated info from #2797962)) // Executable scanning reports "2.000.274" @@ -1626,7 +1622,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.000", 0, "57084910bc923bff5d6d9bc1b56e9604", 5028766}, {"resource.msg", 0, "795c928cd00dfec9fbc62ebcd12e1f65", 303185}, AD_LISTEND}, - Common::DE_DEU, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::DE_DEU, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Laura Bow 2 - Spanish DOS CD (from jvprat) // Executable scanning reports "2.000.274", VERSION file reports "1.000.000, May 10, 1994" @@ -1635,7 +1631,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.000", 0, "57084910bc923bff5d6d9bc1b56e9604", 5028766}, {"resource.msg", 0, "71f1f0cd9f082da2e750c793a8ed9d84", 286141}, AD_LISTEND}, - Common::ES_ESP, Common::kPlatformPC, ADGF_CD, GUIO_NONE }, + Common::ES_ESP, Common::kPlatformPC, ADGF_CD, GUIO1(GUIO_NONE) }, // Larry 1 EGA Remake - English DOS (from spookypeanut) // SCI interpreter version 0.000.510 (or 0.000.577?) @@ -1646,7 +1642,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.002", 0, "24c958bc922b07f91e25e8c93aa01fcf", 491230}, {"resource.003", 0, "685cd6c1e05a695ab1e0db826337ee2a", 553279}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, #if 0 // The resource.002 file, contained in disk 3, is broken in this version @@ -1664,7 +1660,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.002", 0, "5790ac0505f7ca98d4567132b875eb1e", 681041}, {"resource.003", 0, "4a34c3367c2fe7eb380d741374da1989", 572251}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO1(GUIO_NOSPEECH) }, #endif // Larry 1 VGA Remake - English DOS (from spookypeanut) @@ -1675,7 +1671,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.001", 0, "ec20246209d7b19f38989261e5c8f5b8", 1111226}, {"resource.002", 0, "85d6935ef77e6b0e16bc307640a0d913", 1088312}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Larry 1 VGA Remake - English DOS (from FRG) // SCI interpreter version 1.000.510 @@ -1685,7 +1681,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.001", 0, "d34cadb11e1aefbb497cf91bc1d3baa7", 1114688}, {"resource.002", 0, "85b030bb66d5342b0a068f1208c431a8", 1078443}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Larry 1 VGA Remake - English Macintosh (from omer_mor, bug report #3328262) {"lsl1sci", "SCI", { @@ -1694,7 +1690,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.001", 0, "aa6f153f70f1e32d1bde465fff08eecf", 1137418}, {"resource.002", 0, "b22c616aa789ebef990290c7ffd86548", 1097477}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformMacintosh, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformMacintosh, 0, GUIO1(GUIO_NOSPEECH) }, // Larry 1 VGA Remake - English DOS Non-Interactive Demo // SCI interpreter version 1.000.084 @@ -1702,7 +1698,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "434e1f6c39d71647b34f0ee57b2bbd68", 444}, {"resource.001", 0, "0c0768215c562d9dace4a5ca53696cf3", 359913}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO1(GUIO_NOSPEECH) }, // Larry 1 VGA Remake - Spanish DOS (from the Leisure Suit Larry Collection, also includes english language) // Executable scanning reports "1.SQ4.057", VERSION file reports "1.000" @@ -1715,7 +1711,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.002", 0, "3fe2a3aec0ed53c7d6db1845a67e3aa2", 1095908}, {"resource.003", 0, "ac175df0ea9a2cba57f0248651856d27", 376556}, AD_LISTEND}, - Common::ES_ESP, Common::kPlatformPC, ADGF_ADDENGLISH, GUIO_NOSPEECH }, + Common::ES_ESP, Common::kPlatformPC, ADGF_ADDENGLISH, GUIO1(GUIO_NOSPEECH) }, // Larry 1 VGA Remake - Russian DOS (also includes english language?!) // Executable scanning reports "1.000.510", VERSION file reports "2.0" @@ -1726,7 +1722,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.001", 0, "bc8ca10c807515d959cbd91f9ba47735", 1123759}, {"resource.002", 0, "b7409ab32bc3bee2d6cce887cd33f2b6", 1092160}, AD_LISTEND}, - Common::RU_RUS, Common::kPlatformPC, ADGF_ADDENGLISH, GUIO_NOSPEECH }, + Common::RU_RUS, Common::kPlatformPC, ADGF_ADDENGLISH, GUIO1(GUIO_NOSPEECH) }, // Larry 1 VGA Remake - Polish DOS (from Polish Leisure Suit Larry Collection, official release) // SCI interpreter version 1.000.577, VERSION file reports "2.1" (this release does NOT include english text) @@ -1734,7 +1730,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "58330a85767e42a2487129913283ab5b", 3228}, {"resource.000", 0, "b6097ff35cdc8469f02150fe2f824198", 4781210}, AD_LISTEND}, - Common::PL_POL, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::PL_POL, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Larry 2 - English Amiga (from www.back2roots.org) // Executable scanning reports "x.yyy.zzz" @@ -1746,7 +1742,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.003", 0, "a0d4a625311d307257da7fc43d00459d", 570356}, {"resource.004", 0, "a0d4a625311d307257da7fc43d00459d", 717844}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO1(GUIO_NOSPEECH) }, // Larry 2 - English DOS Non-Interactive Demo // Executable scanning reports "x.yyy.zzz" @@ -1755,7 +1751,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "03dba704bb77da55a91ad27b5a3cac09", 528}, {"resource.001", 0, "9f5520f0297206928df0b0b36493cd33", 127532}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO1(GUIO_NOSPEECH) }, // Larry 2 - English DOS // SCI interpreter version 0.000.409 @@ -1768,7 +1764,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.005", 0, "4a24443a25e2b1492462a52809605dc2", 277732}, {"resource.006", 0, "4a24443a25e2b1492462a52809605dc2", 345683}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Larry 2 - English DOS // SCI interpreter version 0.000.343 @@ -1783,7 +1779,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { //{"resource.006", 0, "96033f57accfca903750413fd09193c8", 345818}, {"resource.006", 0, "96033f57accfca903750413fd09193c8", -1}, // 345818 or 208739 AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Larry 2 - English DOS (supplied by ssburnout in bug report #3049193) // 1.000.011 3x3.5" (label: Int. #0.000.343) @@ -1793,7 +1789,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.002", 0, "96033f57accfca903750413fd09193c8", 407014}, {"resource.003", 0, "96033f57accfca903750413fd09193c8", 592834}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Larry 2 - English DOS (supplied by ssburnout in bug report #3049193) // 1.002.000 3x3.5" (label: INT#0.000.409) @@ -1803,7 +1799,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.002", 0, "4a24443a25e2b1492462a52809605dc2", 406935}, {"resource.003", 0, "4a24443a25e2b1492462a52809605dc2", 592533}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Larry 3 - English Amiga (from www.back2roots.org) // Executable scanning reports "1.002.032" @@ -1817,7 +1813,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.004", 0, "f408e59cbee1457f042e5773b8c53951", 651634}, {"resource.005", 0, "433911eb764089d493aed1f958a5615a", 524259}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO1(GUIO_NOSPEECH) }, // Larry 3 - English DOS // SCI interpreter version 0.000.572 @@ -1828,7 +1824,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.003", 0, "f18441027154292836b973c655fa3175", 506807}, {"resource.004", 0, "f18441027154292836b973c655fa3175", 513651}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Larry 3 - English DOS (supplied by ssburnout in bug report #3049193) // 1.021 8x5.25" (label: Int#5.15.90) @@ -1842,7 +1838,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.006", 0, "f18441027154292836b973c655fa3175", 282649}, {"resource.007", 0, "f18441027154292836b973c655fa3175", 257178}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Larry 3 - English DOS // SCI interpreter version 0.000.572 @@ -1856,7 +1852,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.006", 0, "f18441027154292836b973c655fa3175", 282465}, {"resource.007", 0, "f18441027154292836b973c655fa3175", 257174}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Larry 3 - English DOS Non-Interactive Demo // SCI interpreter version 0.000.530 @@ -1865,7 +1861,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.001", 0, "f773d79b93dfd4052ec8c1cc64c1e6ab", 76525}, {"resource.002", 0, "f773d79b93dfd4052ec8c1cc64c1e6ab", 268299}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO1(GUIO_NOSPEECH) }, // Larry 3 - German DOS (from Tobis87, updated info from markcoolio in bug report #2723832, also includes english language) // Executable scanning reports "S.old.123" @@ -1877,7 +1873,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.003", 0, "3827a9b17b926e12dcc336860f50612a", 587036}, {"resource.004", 0, "3827a9b17b926e12dcc336860f50612a", 691932}, AD_LISTEND}, - Common::DE_DEU, Common::kPlatformPC, ADGF_ADDENGLISH, GUIO_NOSPEECH }, + Common::DE_DEU, Common::kPlatformPC, ADGF_ADDENGLISH, GUIO1(GUIO_NOSPEECH) }, // Larry 3 - French DOS (provided by richiefs in bug report #2670691, also includes english language) // Executable scanning reports "S.old.123" @@ -1889,7 +1885,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.003", 0, "65f1bdaa20f6d0470e9d969f22473873", 586921}, {"resource.004", 0, "65f1bdaa20f6d0470e9d969f22473873", 690826}, AD_LISTEND}, - Common::FR_FRA, Common::kPlatformPC, ADGF_ADDENGLISH, GUIO_NOSPEECH }, + Common::FR_FRA, Common::kPlatformPC, ADGF_ADDENGLISH, GUIO1(GUIO_NOSPEECH) }, // Larry 3 1.050 Fr/En (9 x 5.25" disks) // Provided by ssburnout in bug report #3046779 @@ -1903,7 +1899,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.006", 0, "65f1bdaa20f6d0470e9d969f22473873", 325292}, {"resource.007", 0, "65f1bdaa20f6d0470e9d969f22473873", 308982}, AD_LISTEND}, - Common::FR_FRA, Common::kPlatformPC, ADGF_ADDENGLISH, GUIO_NOSPEECH }, + Common::FR_FRA, Common::kPlatformPC, ADGF_ADDENGLISH, GUIO1(GUIO_NOSPEECH) }, // Larry 5 - English Amiga // Executable scanning reports "1.004.023" @@ -1918,7 +1914,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.005", 0, "f8b2d1137bb767e5d232056b99dd69eb", 623621}, {"resource.006", 0, "bafc64e3144f115dc58c6aee02de98fb", 715598}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO1(GUIO_NOSPEECH) }, // Larry 5 - German Amiga (also includes english language) // Executable scanning reports "1.004.024" @@ -1934,7 +1930,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.006", 0, "bafc64e3144f115dc58c6aee02de98fb", 754966}, {"resource.007", 0, "59eba83ad465b08d763b44f86afa86f6", 683135}, AD_LISTEND}, - Common::DE_DEU, Common::kPlatformAmiga, ADGF_ADDENGLISH, GUIO_NOSPEECH }, + Common::DE_DEU, Common::kPlatformAmiga, ADGF_ADDENGLISH, GUIO1(GUIO_NOSPEECH) }, // Larry 5 - English DOS Non-Interactive Demo (from FRG) // SCI interpreter version 1.000.181 @@ -1942,7 +1938,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "efe8d3f45ce4f6bd9a6643e0ac8d2a97", 504}, {"resource.001", 0, "8bd8d9c0b5f455ee1269d63ce86c50dd", 531380}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO1(GUIO_NOSPEECH) }, // Larry 5 - English DOS (from spookypeanut) // SCI interpreter version 1.000.510 @@ -1957,7 +1953,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.006", 0, "dda27ce00682aa76198dac124bbbe334", 1024810}, {"resource.007", 0, "ac443fae1285fb359bf2b2bc6a7301ae", 1030656}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Larry 5 - English Macintosh (from omer_mor, bug report #3328257) {"lsl5", "", { @@ -1971,7 +1967,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.006", 0, "dda27ce00682aa76198dac124bbbe334", 1110043}, {"resource.007", 0, "ac443fae1285fb359bf2b2bc6a7301ae", 989801}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformMacintosh, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformMacintosh, 0, GUIO1(GUIO_NOSPEECH) }, // Larry 5 - German DOS (from Tobis87) // SCI interpreter version T.A00.196 @@ -1986,7 +1982,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.006", 0, "dda27ce00682aa76198dac124bbbe334", 1021774}, {"resource.007", 0, "ac443fae1285fb359bf2b2bc6a7301ae", 993408}, AD_LISTEND}, - Common::DE_DEU, Common::kPlatformPC, ADGF_ADDENGLISH, GUIO_NOSPEECH }, + Common::DE_DEU, Common::kPlatformPC, ADGF_ADDENGLISH, GUIO1(GUIO_NOSPEECH) }, // Larry 5 - French DOS (provided by richiefs in bug report #2670691) // Executable scanning reports "1.lsl5.019" @@ -2002,7 +1998,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.006", 0, "dda27ce00682aa76198dac124bbbe334", 946540}, {"resource.007", 0, "ac443fae1285fb359bf2b2bc6a7301ae", 958842}, AD_LISTEND}, - Common::FR_FRA, Common::kPlatformPC, ADGF_ADDENGLISH, GUIO_NOSPEECH }, + Common::FR_FRA, Common::kPlatformPC, ADGF_ADDENGLISH, GUIO1(GUIO_NOSPEECH) }, // Larry 5 - Spanish DOS (from the Leisure Suit Larry Collection) // Executable scanning reports "1.ls5.006", VERSION file reports "1.000, 4/21/92" @@ -2018,7 +2014,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.006", 0, "dda27ce00682aa76198dac124bbbe334", 1015136}, {"resource.007", 0, "ac443fae1285fb359bf2b2bc6a7301ae", 987222}, AD_LISTEND}, - Common::ES_ESP, Common::kPlatformPC, ADGF_ADDENGLISH, GUIO_NOSPEECH }, + Common::ES_ESP, Common::kPlatformPC, ADGF_ADDENGLISH, GUIO1(GUIO_NOSPEECH) }, // Larry 5 - Italian DOS Floppy (from glorifindel) // SCI interpreter version 1.000.510 (just a guess) @@ -2026,7 +2022,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "a99776df795127f387cb35dae872d4e4", 5919}, {"resource.000", 0, "a8989a5a89e7d4f702b26b378c7a357a", 7001981}, AD_LISTEND}, - Common::IT_ITA, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::IT_ITA, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Larry 5 1.0 EGA DOS (8 x 3.5" disks) // Provided by ssburnout in bug report #3046806 @@ -2041,7 +2037,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.006", 0, "f6046a8445422f17d40b1b10ab21ebf3", 568551}, {"resource.007", 0, "640ee65595d40372ef95462f2c1ae28a", 593429}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Larry 5 EGA // Supplied by omer_mor in bug report #3049771 @@ -2052,7 +2048,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.002", 0, "5a55af4e40728b1a8103dc47ad2afa8d", 1100539}, {"resource.003", 0, "16f4d8fb1b526125edaca4fc6cbb7530", 1064563}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Larry 6 - English DOS (from spookypeanut) // SCI interpreter version 1.001.113 @@ -2060,7 +2056,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "bb8a39d9e2a77ba449a1e591109ad9a8", 6973}, {"resource.000", 0, "4462fe48c7452d98fddcec327a3e738d", 5789138}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Larry 6 - English/German/French DOS CD - LOWRES // SCI interpreter version 1.001.115 @@ -2068,7 +2064,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "0b91234b7112782962cb480b7791b6e2", 7263}, {"resource.000", 0, "57d5fe8bb9e044158514476ea7678eb0", 5754790}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_CD, GUIO_NONE }, + Common::EN_ANY, Common::kPlatformPC, ADGF_CD, GUIO1(GUIO_NONE) }, // Larry 6 - German DOS CD - LOWRES (provided by richiefs in bug report #2670691) // SCI interpreter version 1.001.115 @@ -2076,7 +2072,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "bafe85f32738854135991d4324ad147e", 7268}, {"resource.000", 0, "f6cbc6da7b90ea135883e0759848ca2c", 5773160}, AD_LISTEND}, - Common::DE_DEU, Common::kPlatformPC, ADGF_CD, GUIO_NONE }, + Common::DE_DEU, Common::kPlatformPC, ADGF_CD, GUIO1(GUIO_NONE) }, // Larry 6 - French DOS CD - LOWRES (provided by richiefs in bug report #2670691) // SCI interpreter version 1.001.115 @@ -2084,7 +2080,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "97797ea775baaf18a1907d357d3c0ea6", 7268}, {"resource.000", 0, "f6cbc6da7b90ea135883e0759848ca2c", 5776092}, AD_LISTEND}, - Common::FR_FRA, Common::kPlatformPC, ADGF_CD, GUIO_NONE }, + Common::FR_FRA, Common::kPlatformPC, ADGF_CD, GUIO1(GUIO_NONE) }, // Larry 6 - Spanish DOS - LOWRES (from the Leisure Suit Larry Collection) // Executable scanning reports "1.001.113", VERSION file reports "1.000, 11.06.93, FIVE PATCHES ADDED TO DISK 6 ON 11-18-93" @@ -2092,7 +2088,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "633bf8f42170b6271019917c8009989b", 6943}, {"resource.000", 0, "7884a8db9253e29e6b37a2651fd90ba3", 5733116}, AD_LISTEND}, - Common::ES_ESP, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::ES_ESP, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Crazy Nick's Software Picks: Leisure Suit Larry's Casino - English DOS (from the Leisure Suit Larry Collection) // Executable scanning reports "1.001.029", VERSION file reports "1.000" @@ -2100,35 +2096,35 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "194f1578f2624db813c9072359ad1639", 783}, {"resource.001", 0, "3733433b517ec3d14a3331d9ab3842ae", 344830}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Crazy Nick's Software Picks: King Graham's Board Game Challenge {"cnick-kq", "", { {"resource.map", 0, "44bc538a5cd24b39ffccc967c0ebf84d", 1137}, {"resource.001", 0, "470e7a4a3504635e70b623c44461e1ac", 451272}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Crazy Nick's Software Picks: Parlor Games with Laura Bow {"cnick-laurabow", "", { {"resource.map", 0, "3b826bfe64f8ff1ccf30eef93cd2f727", 999}, {"resource.001", 0, "985ac8db6f636f2b4334c04b0fbb44fb", 336698}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Crazy Nick's Software Picks: Robin Hood's Game of Skill and Chance {"cnick-longbow", "", { {"resource.map", 0, "4a5c81f485a2416bde12978506f2fb5f", 897}, {"resource.001", 0, "ef16dc9e867eb8eeb5b13e110b90bd4b", 571466}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Crazy Nick's Software Picks: Roger Wilco's Spaced Out Game Pack {"cnick-sq", "", { {"resource.map", 0, "b4d95b02d84e297441bd999d34eaa6b1", 879}, {"resource.001", 0, "82ff2b64a60117886fbcd6a3a8c977c6", 364921}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, #ifdef ENABLE_SCI32 // Larry 6 - English/German DOS CD - HIRES @@ -2137,7 +2133,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "0c0804434ea62278dd15032b1947426c", 8872}, {"resource.000", 0, "9a9f4870504444cda863dd14d077a680", 18520872}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, GUIO_NONE }, + Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, GUIO1(GUIO_NONE) }, // Larry 6 - German DOS CD - HIRES (provided by richiefs in bug report #2670691) // SCI interpreter version 2.100.002 @@ -2145,7 +2141,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "badfdf446ffed569a310d2c63a249421", 8896}, {"resource.000", 0, "bd944d2b06614a5b39f1586906f0ee88", 18534274}, AD_LISTEND}, - Common::DE_DEU, Common::kPlatformPC, ADGF_UNSTABLE, GUIO_NONE }, + Common::DE_DEU, Common::kPlatformPC, ADGF_UNSTABLE, GUIO1(GUIO_NONE) }, // Larry 6 - French DOS CD - HIRES (provided by richiefs in bug report #2670691) // SCI interpreter version 2.100.002 @@ -2153,7 +2149,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "d184e9aa4f2d4b5670ddb3669db82cda", 8896}, {"resource.000", 0, "bd944d2b06614a5b39f1586906f0ee88", 18538987}, AD_LISTEND}, - Common::FR_FRA, Common::kPlatformPC, ADGF_UNSTABLE, GUIO_NONE }, + Common::FR_FRA, Common::kPlatformPC, ADGF_UNSTABLE, GUIO1(GUIO_NONE) }, // Larry 7 - English DOS Demo (provided by richiefs in bug report #2670691) // SCI interpreter version 2.100.002 @@ -2161,7 +2157,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"ressci.000", 0, "5cc6159688b2dc03790a67c90ccc67f9", 10195878}, {"resmap.000", 0, "6a2b2811eef82e87cde91cf1de845af8", 2695}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO | ADGF_UNSTABLE, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO | ADGF_UNSTABLE, GUIO1(GUIO_NOSPEECH) }, #ifdef ENABLE_SCI3_GAMES // Larry 7 - English DOS CD (from spookypeanut) @@ -2170,7 +2166,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resmap.000", 0, "eae93e1b1d1ccc58b4691c371281c95d", 8188}, {"ressci.000", 0, "89353723488219e25589165d73ed663e", 66965678}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, GUIO_NONE }, + Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, GUIO1(GUIO_NONE) }, // Larry 7 - German DOS (from Tobis87) // SCI interpreter version 3.000.000 @@ -2178,7 +2174,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resmap.000", 0, "c11e6bfcfc2f2d05da47e5a7df3e9b1a", 8188}, {"ressci.000", 0, "a8c6817bb94f332ff498a71c8b47f893", 66971724}, AD_LISTEND}, - Common::DE_DEU, Common::kPlatformPC, ADGF_UNSTABLE, GUIO_NOSPEECH }, + Common::DE_DEU, Common::kPlatformPC, ADGF_UNSTABLE, GUIO1(GUIO_NOSPEECH) }, // Larry 7 - French DOS (provided by richiefs in bug report #2670691) // SCI interpreter version 3.000.000 @@ -2186,7 +2182,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resmap.000", 0, "4407849fd52fe3efb0c30fba60cd5cd4", 8206}, {"ressci.000", 0, "dc37c3055fffbefb494ff22b145d377b", 66964472}, AD_LISTEND}, - Common::DE_DEU, Common::kPlatformPC, ADGF_UNSTABLE, GUIO_NOSPEECH }, + Common::DE_DEU, Common::kPlatformPC, ADGF_UNSTABLE, GUIO1(GUIO_NOSPEECH) }, // Larry 7 - Italian DOS CD (from glorifindel) // SCI interpreter version 3.000.000 @@ -2194,7 +2190,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resmap.000", 0, "9852a97141f789413f29bf956052acdb", 8212}, {"ressci.000", 0, "440b9fed89590abb4e4386ed6f948ee2", 67140181}, AD_LISTEND}, - Common::IT_ITA, Common::kPlatformPC, ADGF_UNSTABLE, GUIO_NONE }, + Common::IT_ITA, Common::kPlatformPC, ADGF_UNSTABLE, GUIO1(GUIO_NONE) }, // Larry 7 - Spanish DOS (from the Leisure Suit Larry Collection) // Executable scanning reports "3.000.000", VERSION file reports "1.0s" @@ -2202,7 +2198,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resmap.000", 0, "8f3d603e1acc834a5d598b30cdfc93f3", 8188}, {"ressci.000", 0, "32792f9bc1bf3633a88b382bb3f6e40d", 67071418}, AD_LISTEND}, - Common::ES_ESP, Common::kPlatformPC, ADGF_UNSTABLE, GUIO_NOSPEECH }, + Common::ES_ESP, Common::kPlatformPC, ADGF_UNSTABLE, GUIO1(GUIO_NOSPEECH) }, #endif // Lighthouse - English Windows Demo (from jvprat) @@ -2211,7 +2207,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "543124606352bfa5e07696ddf2a669be", 64}, {"resource.000", 0, "5d7714416b612463d750fb9c5690c859", 28952}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO | ADGF_UNSTABLE, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO | ADGF_UNSTABLE, GUIO1(GUIO_NOSPEECH) }, #ifdef ENABLE_SCI3_GAMES // Lighthouse - English Windows Demo @@ -2220,7 +2216,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resmap.000", 0, "3bdee7a16926975a4729f75cf6b80a92", 1525}, {"ressci.000", 0, "3c585827fa4a82f4c04a56a0bc52ccee", 11494351}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO | ADGF_UNSTABLE, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO | ADGF_UNSTABLE, GUIO1(GUIO_NOSPEECH) }, // Lighthouse - English DOS (from jvprat) // Executable scanning reports "3.000.000", VERSION file reports "1.1" @@ -2230,7 +2226,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resmap.002", 0, "c68db5333f152fea6ca2dfc75cad8b34", 7573}, {"ressci.002", 0, "175468431a979b9f317c294ce3bc1430", 94628315}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, GUIO1(GUIO_NOSPEECH) }, // Lighthouse - Spanish DOS (from jvprat) // Executable scanning reports "3.000.000", VERSION file reports "1.1" @@ -2240,7 +2236,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resmap.002", 0, "e7dc85884a2417e2eff9de0c63dd65fa", 7630}, {"ressci.002", 0, "3c8d627c555b0e3e4f1d9955bc0f0df4", 94631127}, AD_LISTEND}, - Common::ES_ESP, Common::kPlatformPC, ADGF_UNSTABLE, GUIO_NOSPEECH }, + Common::ES_ESP, Common::kPlatformPC, ADGF_UNSTABLE, GUIO1(GUIO_NOSPEECH) }, #endif // ENABLE_SCI3_GAMES #endif // ENABLE_SCI32 @@ -2251,7 +2247,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.000", 0, "8be56a3a88c065ee00c02c0e29199f3a", 14643}, {"resource.001", 0, "9e33566515b18bee7915db448063bba2", 871853}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO1(GUIO_NOSPEECH) }, // Mixed-Up Fairy Tales - English DOS Floppy EGA (from omer_mor, bug report #3035350) {"fairytales", "EGA", { @@ -2262,7 +2258,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.003", 0, "509b2467ba779100d5933ed51a9ae32f", 560255}, {"resource.004", 0, "93afc85d5ffa60ea555d6cc336d22c03", 651109}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Mixed-Up Fairy Tales v1.000 - English DOS (supplied by markcoolio in bug report #2723791) // Executable scanning reports "1.000.145" @@ -2274,7 +2270,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.003", 0, "b1288e0821ee358d1ffe877e5900c8ec", 1047565}, {"resource.004", 0, "f79daa70390d73746742ffcfc3dc4471", 937580}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Mixed-Up Fairy Tales - English DOS Floppy (from jvprat) // Executable scanning reports "1.000.145", Floppy label reports "1.0, 11.13.91", VERSION file reports "1.000" @@ -2285,7 +2281,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.002", 0, "564f516d991032e781492592a4eaa275", 1414142}, {"resource.003", 0, "dd6cef0c592eadb7e6be9a25307c57a2", 1344719}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Mixed-Up Mother Goose - English Amiga (from www.back2roots.org) // Executable scanning reports "1.003.009" @@ -2295,7 +2291,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.001", 0, "fb552ae550ca1dac19ed8f6a3767612d", 262885}, {"resource.002", 0, "fb552ae550ca1dac19ed8f6a3767612d", 817191}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO1(GUIO_NOSPEECH) }, // Mixed-Up Mother Goose - English DOS Floppy EGA (from omer_mor, bug report #3035354) {"mothergoose", "EGA", { @@ -2303,7 +2299,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.001", 0, "d893892d62b3f061357291d66775e360", 239906}, {"resource.002", 0, "d893892d62b3f061357291d66775e360", 719398}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Mixed-Up Mother Goose - English DOS Floppy EGA (supplied by ssburnout in bug report #3049193) // 1.011 5x5.25" (label: Int#8.2.90) @@ -2316,7 +2312,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.004", 0, "dbbc22f124533ce308bc386b08956326", 146251}, {"resource.005", 0, "2ba5348e7fad641b9c4c7ff7c7cf4e68", 110979}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Mixed-Up Mother Goose v2.000 - English DOS Floppy (supplied by markcoolio in bug report #2723795) // Executable scanning reports "1.001.031" @@ -2324,7 +2320,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "52aae15e493cafd1da7e1c9b657a5bb9", 7026}, {"resource.000", 0, "b7ecd8ae9e254e80310b5a668b276e6e", 2948975}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Mixed-Up Mother Goose - English DOS CD (from jvprat) // Executable scanning reports "x.yyy.zzz" @@ -2333,7 +2329,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "1c7f311b0a2c927b2fbe81ae341fb2f6", 5790}, {"resource.001", 0, "5a0ed1d745855148364de1b3be099bac", 4369438}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_CD, GUIO_NONE }, + Common::EN_ANY, Common::kPlatformPC, ADGF_CD, GUIO1(GUIO_NONE) }, // Mixed-Up Mother Goose - English Windows Interactive Demo // Executable scanning reports "x.yyy.zzz" @@ -2341,14 +2337,14 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "87f9dc1cafc4d4fa835fb2f00cf3a6ef", 4560}, {"resource.001", 0, "5a0ed1d745855148364de1b3be099bac", 2070072}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformWindows, ADGF_DEMO, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformWindows, ADGF_DEMO, GUIO1(GUIO_NOSPEECH) }, // Mixed-Up Mother Goose - FM-Towns (supplied by abevi in bug report #3038720) {"mothergoose256", "", { {"resource.map", 0, "b11e971ccd2040bebba59dfb409a08ef", 5772}, {"resource.001", 0, "d49625d9b8005ec01c852f8322a82867", 4330713}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformFMTowns, 0, GUIO_NONE }, + Common::EN_ANY, Common::kPlatformFMTowns, 0, GUIO1(GUIO_NONE) }, #ifdef ENABLE_SCI32 // Mixed-Up Mother Goose Deluxe - English Windows/DOS CD (supplied by markcoolio in bug report #2723810) @@ -2357,7 +2353,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "5159a1578c4306bfe070a3e4d8c2e1d3", 4741}, {"resource.000", 0, "1926925c95d82f0999590e93b02887c5", 15150768}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, GUIO_NONE }, + Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, GUIO1(GUIO_NONE) }, // Mixed-Up Mother Goose Deluxe - Multilingual Windows CD (English/French/German/Spanish) // Executable scanning reports "2.100.002" @@ -2365,7 +2361,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resmap.000", 0, "ef611af561898dcfea87846919ebf3eb", 4969}, {"ressci.000", 0, "227685bc59d90821978d330713e44a7a", 17205800}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, GUIO_NONE }, + Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, GUIO1(GUIO_NONE) }, #endif // ENABLE_SCI32 // Ms. Astro Chicken - English DOS @@ -2374,7 +2370,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "5b457cbe5042f557e5b610148171f6c0", 1158}, {"resource.001", 0, "453ea81ef66a50cbe33ce06302afe47f", 229737}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, #ifdef ENABLE_SCI32 // Phantasmagoria - English DOS (from jvprat) @@ -2395,7 +2391,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resmap.007", 0, "afbd16ea77869a720afa1c5371de107d", 7972}, //{"ressci.007", 0, "3aae6559aa1df273bc542d5ac6330d75", 25859038}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, GUIO1(GUIO_NOSPEECH) }, // Phantasmagoria - English DOS Demo // Executable scanning reports "2.100.002" @@ -2403,7 +2399,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resmap.001", 0, "416138651ea828219ca454cae18341a3", 11518}, {"ressci.001", 0, "3aae6559aa1df273bc542d5ac6330d75", 65844612}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO | ADGF_UNSTABLE, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO | ADGF_UNSTABLE, GUIO1(GUIO_NOSPEECH) }, // Phantasmagoria - English DOS/Windows (GOG version) - ressci.* merged in ressci.000 // Windows executable scanning reports "2.100.002" - "Sep 19 1995 15:09:43" @@ -2414,7 +2410,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"ressci.000", 0, "cd5967f9b9586e3380645961c0765be3", 116822037}, {"resmap.000", 0, "3cafc1c6a53945c1f3babbfd6380c64c", 16468}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, GUIO1(GUIO_NOSPEECH) }, // Phantasmagoria - English Macintosh // NOTE: This only contains disc 1 files (as well as the two persistent files: @@ -2430,7 +2426,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { // Data8-12 are empty {"Data13", 0, "6d2c450fca19a69b5af74ed5b03c0a17", 14923328}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformMacintosh, ADGF_MACRESFORK | ADGF_UNSTABLE, GUIO_NONE }, + Common::EN_ANY, Common::kPlatformMacintosh, ADGF_MACRESFORK | ADGF_UNSTABLE, GUIO1(GUIO_NONE) }, #ifdef ENABLE_SCI3_GAMES // Phantasmagoria 2 - English Windows (from jvprat) @@ -2447,7 +2443,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resmap.005", 0, "8bd5ceeedcbe16dfe55d1b90dcd4be84", 1942}, {"ressci.005", 0, "05f9fe2bee749659acb3cd2c90252fc5", 67905112}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE, GUIO1(GUIO_NOSPEECH) }, // Phantasmagoria 2 - English DOS (GOG version) - ressci.* merged in ressci.000 // Executable scanning reports "3.000.000" - "Dec 07 1996 09:29:03" @@ -2457,7 +2453,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"ressci.000", 0, "c54f26d9f43f908151263254b6d97053", 108134481}, {"resmap.000", 0, "de154a223a9ef4ea7358b76adc38ef5b", 2956}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE, GUIO1(GUIO_NOSPEECH) }, #endif // ENABLE_SCI3_GAMES #endif // ENABLE_SCI32 @@ -2468,7 +2464,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "72726dc81c1b4c1110c486be77369bc8", 5179}, {"resource.000", 0, "670d0c53622429f4b11275caf7f8d292", 5459574}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Pepper - English DOS Non-Interactive Demo // Executable scanning reports "1.001.060", VERSION file reports "1.000" @@ -2476,7 +2472,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "379bb4fb896630b14f2d91ed21e36ba1", 984}, {"resource.000", 0, "118f6c31a93ec7fd9a231c61125229e3", 645494}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO1(GUIO_NOSPEECH) }, // Pepper - English DOS/Windows Interactive Demo // Executable scanning reports "1.001.069", VERSION file reports ".001" @@ -2484,7 +2480,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "975e8df76106a5c13d12ab674f906a02", 2514}, {"resource.000", 0, "e6a918a2dd7a4bcecd8fb389f43287c2", 1698164}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO1(GUIO_NOSPEECH) }, // Pepper - English DOS Interactive Demo // Executable scanning reports "1.001.072", VERSION file reports "1.000" @@ -2492,7 +2488,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "9c9b7b900651a370dd3fb38d478b1798", 2524}, {"resource.000", 0, "e6a918a2dd7a4bcecd8fb389f43287c2", 1713544}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO1(GUIO_NOSPEECH) }, // Police Quest 1 VGA Remake - English DOS (from the Police Quest Collection) // Executable scanning reports "1.001.029", VERSION file reports "2.000" @@ -2500,7 +2496,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "35efa814fb994b1cbdac9611e401da67", 5013}, {"resource.000", 0, "e0d5ddf34eda903a38f0837e2aa7145b", 6401433}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Police Quest 2 - English Amiga (from www.back2roots.org) // SCI interpreter version 0.000.685 (just a guess) @@ -2511,7 +2507,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.002", 0, "499737c21a28ac026e11ab817100d610", 511099}, {"resource.003", 0, "e008f5d6e2a7c4d4a0da0173e4fa8f8b", 553970}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO1(GUIO_NOSPEECH) }, // Police Quest 2 - English DOS Non-Interactive Demo // Executable scanning reports "0.000.413" @@ -2519,7 +2515,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "8b77d0d4650c2052b356cece28294b58", 576}, {"resource.001", 0, "376ef6d6eaaeed66e1424bd219c4b9ab", 215398}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO1(GUIO_NOSPEECH) }, // Police Quest 2 - English DOS (provided by richiefs in bug report #2670691) // SCI interpreter version 0.000.395 @@ -2532,7 +2528,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.005", 0, "77f02def3094af804fd2371db25b7100", 349899}, {"resource.006", 0, "77f02def3094af804fd2371db25b7100", 354991}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Police Quest 2 - English DOS (from the Police Quest Collection) // Executable scanning reports "0.000.490" @@ -2542,7 +2538,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.002", 0, "77f02def3094af804fd2371db25b7100", 546000}, {"resource.003", 0, "77f02def3094af804fd2371db25b7100", 591851}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Police Quest 2 - English DOS (from FRG) // SCI interpreter version 0.000.395 @@ -2552,7 +2548,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.002", 0, "77f02def3094af804fd2371db25b7100", 542897}, {"resource.003", 0, "77f02def3094af804fd2371db25b7100", 586857}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Police Quest 2 English DOS 1.001.006 (supplied by merkur-kun in bug report #3028479) {"pq2", "", { @@ -2561,7 +2557,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.002", 0, "77f02def3094af804fd2371db25b7100", 541261}, {"resource.003", 0, "77f02def3094af804fd2371db25b7100", 587511}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Police Quest 2 - Japanese PC-98 (also includes english language) // SCI interpreter version unknown @@ -2571,7 +2567,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.002", 0, "05fdee43a228dd6ea4d1a92ccae3f788", 637662}, {"resource.003", 0, "05fdee43a228dd6ea4d1a92ccae3f788", 684395}, AD_LISTEND}, - Common::JA_JPN, Common::kPlatformPC98, ADGF_ADDENGLISH, GUIO_NOSPEECH }, + Common::JA_JPN, Common::kPlatformPC98, ADGF_ADDENGLISH, GUIO1(GUIO_NOSPEECH) }, // Police Quest 3 - English Amiga // Executable scanning reports "1.004.024" @@ -2584,7 +2580,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.003", 0, "630bfa65beb05f743552704ac2899dae", 759891}, {"resource.004", 0, "7b229fbdf30d670d0728cede3e984a7e", 838663}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO1(GUIO_NOSPEECH) }, // Police Quest 3 - German Amiga (also includes english language) // Executable scanning reports "1.004.024" @@ -2598,7 +2594,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.004", 0, "6258d5dd85898d8e218eb8113ebc9059", 722738}, {"resource.005", 0, "6258d5dd85898d8e218eb8113ebc9059", 704485}, AD_LISTEND}, - Common::DE_DEU, Common::kPlatformAmiga, ADGF_ADDENGLISH, GUIO_NOSPEECH }, + Common::DE_DEU, Common::kPlatformAmiga, ADGF_ADDENGLISH, GUIO1(GUIO_NOSPEECH) }, // Police Quest 3 - English DOS (from the Police Quest Collection) // Executable scanning reports "T.A00.178", VERSION file reports "1.00" @@ -2611,7 +2607,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.003", 0, "8791b9eef53edf77c2dac950142221d3", 1159791}, {"resource.004", 0, "1b91e891a3c60a941dac0eecdf83375b", 1143606}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Police Quest 3 - English DOS Non-Interactive Demo // Executable scanning reports "T.A00.052" @@ -2621,7 +2617,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.000", 0, "277f97771f7a6d89677141f02da313d6", 65150}, {"resource.001", 0, "5c5a551b6c86cce2ee75becb90e0b586", 624411}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO1(GUIO_NOSPEECH) }, // Police Quest 3 - German DOS (supplied by markcoolio in bug report #2723837, also includes english language) // Executable scanning reports "T.A00.178" @@ -2634,7 +2630,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.003", 0, "4836f460f4cfc8de61e2df4c45775504", 1180956}, {"resource.004", 0, "0c3eb84b9755852d9e795e0d5c9373c7", 1171760}, AD_LISTEND}, - Common::DE_DEU, Common::kPlatformPC, ADGF_ADDENGLISH, GUIO_NOSPEECH }, + Common::DE_DEU, Common::kPlatformPC, ADGF_ADDENGLISH, GUIO1(GUIO_NOSPEECH) }, // Police Quest 3 EGA // Reported by musiclyinspired in bug report #3046573 @@ -2647,7 +2643,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.004", 0, "b96a86ab681769e4cbb439670d967ca6", 449682}, {"resource.005", 0, "9e6c53a0e7eef53694d260fade8b1fc7", 724000}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Police Quest 4 - English DOS Non-Interactive Demo (from FRG) // SCI interpreter version 1.001.096 @@ -2655,7 +2651,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "be56f87a1c4a13062a30a362df860c2f", 1472}, {"resource.000", 0, "527d5684016e6816157cd15d9071b11b", 1121310}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO1(GUIO_NOSPEECH) }, #ifdef ENABLE_SCI32 // Police Quest 4 - English DOS CD (from the Police Quest Collection) @@ -2664,7 +2660,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "379dfe80ed6bd16c47e4b950c4722eac", 11374}, {"resource.000", 0, "fd316a09b628b7032248139003369022", 18841068}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_CD | ADGF_UNSTABLE, GUIO_NONE }, + Common::EN_ANY, Common::kPlatformPC, ADGF_CD | ADGF_UNSTABLE, GUIO1(GUIO_NONE) }, // Police Quest 4 - German DOS CD (German text, English speech) // Supplied by markcoolio in bug report #3392955 @@ -2672,7 +2668,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "a398076371ed0e1e706c8f9fb9fc7ac5", 11386}, {"resource.000", 0, "6ff21954e0a2c5992279e7eb787c8d56", 18918747}, AD_LISTEND}, - Common::DE_DEU, Common::kPlatformPC, ADGF_CD | ADGF_UNSTABLE, GUIO_NONE }, + Common::DE_DEU, Common::kPlatformPC, ADGF_CD | ADGF_UNSTABLE, GUIO1(GUIO_NONE) }, // Police Quest 4 - English DOS // SCI interpreter version 2.000.000 (a guess?) @@ -2680,7 +2676,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "aed9643158ccf01b71f359db33137f82", 9895}, {"resource.000", 0, "da383857b3be1e4514daeba2524359e0", 15141432}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, GUIO1(GUIO_NOSPEECH) }, // Police Quest 4 - French DOS (supplied by abevi in bug report #2612718) // SCI interpreter version 2.000.000 @@ -2688,7 +2684,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "008030846edcc7c5c7a812c7f4ae4ceb", 9256}, {"resource.000", 0, "6ba98bd2e436739d87ecd2a9b99cabb4", 14730153}, AD_LISTEND}, - Common::FR_FRA, Common::kPlatformPC, ADGF_UNSTABLE, GUIO_NOSPEECH }, + Common::FR_FRA, Common::kPlatformPC, ADGF_UNSTABLE, GUIO1(GUIO_NOSPEECH) }, // Police Quest 4 - German DOS (supplied by markcoolio in bug report #2723840) // SCI interpreter version 2.000.000 (a guess?) @@ -2696,7 +2692,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "2393ee728ab930b2762cb5889f9b5aff", 9256}, {"resource.000", 0, "6ba98bd2e436739d87ecd2a9b99cabb4", 14730155}, AD_LISTEND}, - Common::DE_DEU, Common::kPlatformPC, ADGF_UNSTABLE, GUIO_NOSPEECH }, + Common::DE_DEU, Common::kPlatformPC, ADGF_UNSTABLE, GUIO1(GUIO_NOSPEECH) }, // Police Quest: SWAT - English DOS/Windows Demo (from jvprat) // Executable scanning reports "2.100.002", VERSION file reports "0.001.200" @@ -2704,7 +2700,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "8c96733ef94c21526792f7ca4e3f2120", 1648}, {"resource.000", 0, "d8892f1b8c56c8f7704325460f49b300", 3676175}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO | ADGF_UNSTABLE, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO | ADGF_UNSTABLE, GUIO1(GUIO_NOSPEECH) }, // Police Quest: SWAT - English DOS (from GOG.com) // Executable scanning reports "2.100.002", VERSION file reports "1.0c" @@ -2712,7 +2708,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resmap.000", 0, "1c2563fee189885e29d9348f37306d94", 12175}, {"ressci.000", 0, "b2e1826ca81ce2e7e764587f5a14eee9", 127149181}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, GUIO_NONE }, + Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, GUIO1(GUIO_NONE) }, // Police Quest: SWAT - English Windows (from the Police Quest Collection) // Executable scanning reports "2.100.002", VERSION file reports "1.0c" @@ -2727,7 +2723,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resmap.004", 0, "4228038906f041623e65789500b22285", 6835}, {"ressci.004", 0, "b7e619e6ecf62fe65d5116a3a422e5f0", 46223872}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE, GUIO_NONE }, + Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE, GUIO1(GUIO_NONE) }, #endif // ENABLE_SCI32 // Quest for Glory 1 / Hero's Quest - English DOS 3.5" Floppy (supplied by merkur in bug report #2718784) @@ -2740,7 +2736,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.003", 0, "7ab2bf8e224b57f75e0cd6e4ba790761", 642203}, {"resource.004", 0, "7ab2bf8e224b57f75e0cd6e4ba790761", 641688}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Quest for Glory 1 / Hero's Quest - English DOS 3.5" Floppy (supplied by alonzotg in bug report #3206006) {"qfg1", "", { @@ -2751,7 +2747,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.003", 0, "7ab2bf8e224b57f75e0cd6e4ba790761", 642203}, {"resource.004", 0, "7ab2bf8e224b57f75e0cd6e4ba790761", 641688}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Quest for Glory 1 / Hero's Quest - English DOS 5.25" Floppy (supplied by markcoolio in bug report #2723843) // Executable scanning reports "0.000.566" @@ -2766,7 +2762,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.006", 0, "69366c2a2f99917199fe1b60a4fee19d", 267852}, {"resource.007", 0, "7ab2bf8e224b57f75e0cd6e4ba790761", 272747}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Quest for Glory 1 / Hero's Quest - English DOS 5.25" Floppy (supplied by ssburnout in bug report #3049193) // 1.001 10x5.25" (label: INT.#0.000.566) @@ -2781,7 +2777,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.006", 0, "69366c2a2f99917199fe1b60a4fee19d", 267852}, {"resource.007", 0, "7ab2bf8e224b57f75e0cd6e4ba790761", 272747}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Quest for Glory 1 / Hero's Quest - English DOS 5.25" Floppy (supplied by ssburnout in bug report #3049193) // 1.200 10x5.25" (label: INT#9.10.90) @@ -2796,7 +2792,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.006", 0, "f46690dca714abc8c89357d30e363dd3", 278387}, {"resource.007", 0, "951299a82a8134ed12c5c18118d45c2f", 269173}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Quest for Glory 1 / Hero's Quest - English DOS Demo // Executable scanning reports "0.000.685" @@ -2804,7 +2800,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "df34c758cbb9026da175793ff686b0e6", 882}, {"resource.001", 0, "73fbaafdd313b39aeedb80fbf85ecef1", 389884}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO1(GUIO_NOSPEECH) }, // Quest for Glory 1 - Japanese PC-98 5.25" Floppy (also includes English language) // Executable scanning reports "S.old.201" @@ -2814,7 +2810,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.002", 0, "a21451ef6fa8179bd4b22c4950004c44", 1136968}, {"resource.003", 0, "a21451ef6fa8179bd4b22c4950004c44", 769897}, AD_LISTEND}, - Common::JA_JPN, Common::kPlatformPC98, ADGF_ADDENGLISH, GUIO_NOSPEECH }, + Common::JA_JPN, Common::kPlatformPC98, ADGF_ADDENGLISH, GUIO1(GUIO_NOSPEECH) }, // Quest for Glory 1 - Japanese PC-98 5.25" Floppy (also includes English language) // Executable scanning reports "S.old.201" @@ -2824,7 +2820,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.002", 0, "a21451ef6fa8179bd4b22c4950004c44", 1147121}, {"resource.003", 0, "a21451ef6fa8179bd4b22c4950004c44", 777575}, AD_LISTEND}, - Common::JA_JPN, Common::kPlatformPC98, ADGF_ADDENGLISH, GUIO_NOSPEECH }, + Common::JA_JPN, Common::kPlatformPC98, ADGF_ADDENGLISH, GUIO1(GUIO_NOSPEECH) }, // Quest for Glory 1 - English Amiga // Executable scanning reports "1.002.020" @@ -2838,7 +2834,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.004", 0, "16cd4414c37ae3bb6d6da33dce8e25e8", 689124}, {"resource.005", 0, "5f3386ef2f2b1254e4a066f5d9027324", 609529}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO1(GUIO_NOSPEECH) }, // Quest for Glory 1 (from abevi, bug report #2612718) {"qfg1", "", { @@ -2849,7 +2845,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.003", 0, "f0af87c60ec869946da442833aa5afa8", 640502}, {"resource.004", 0, "f0af87c60ec869946da442833aa5afa8", 644575}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO1(GUIO_NOSPEECH) }, // Quest for Glory 1 - English DOS // SCI interpreter version 0.000.629 @@ -2861,7 +2857,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.003", 0, "951299a82a8134ed12c5c18118d45c2f", 640483}, {"resource.004", 0, "951299a82a8134ed12c5c18118d45c2f", 644443}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Quest for Glory 1 VGA Remake - English DOS // Executable scanning reports "2.000.411" @@ -2869,7 +2865,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "a731fb6c9c0b282443f7027bc8694d4c", 8469}, {"resource.000", 0, "ecace1a2771846b1a8aa1afdd44111a0", 6570147}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Quest for Glory 1 VGA Remake - English DOS Non-Interactive Demo (from FRG) // SCI interpreter version 1.001.029 @@ -2877,7 +2873,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "ac0257051c95a59c0cdc0be24d9b11fa", 729}, {"resource.000", 0, "ec6f5cf369054dd3e5392995e9975b9e", 768218}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO1(GUIO_NOSPEECH) }, // Quest for Glory 1 VGA Remake - English Macintosh Floppy // VERSION file reports "2.0" @@ -2885,7 +2881,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"Data1", 0, "106527ff8756e4e1a795d63d23e8b833", 1752358}, {"Data2", 0, "5cdd92033231159c6e9c71d43e9f194d", 6574746}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformMacintosh, ADGF_MACRESFORK, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformMacintosh, ADGF_MACRESFORK, GUIO1(GUIO_NOSPEECH) }, // Quest for Glory 2 - English Amiga // Executable scanning reports "1.003.004" @@ -2901,7 +2897,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.006", 0, "ccf5dba33e5cab6d5872838c0f8db44c", 500039}, {"resource.007", 0, "4c9fc1587545879295cb9627f56a2cb8", 575056}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO1(GUIO_NOSPEECH) }, // Quest for Glory 2 - English (supplied by ssburnout in bug report #3049193) // 1.000 5x5.25" (label: INT#10.31.90) @@ -2913,7 +2909,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.003", 0, "0790f67d87642132be515cab05026baa", 972144}, {"resource.004", 0, "2ac1e6fea9aa1f5b91a06693a67b9766", 982830}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Quest for Glory 2 - English (supplied by ssburnout in bug report #3049193) // 1.000 9x3.5" (label: INT#10.31.90) @@ -2928,7 +2924,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.006", 0, "5e9deacbdb17198ad844988e04833520", 498593}, {"resource.007", 0, "2ac1e6fea9aa1f5b91a06693a67b9766", 490151}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Quest for Glory 2 - English (from FRG) // Executable scanning reports "1.000.072" @@ -2940,7 +2936,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.003", 0, "b192607c42f6960ecdf2ad2e4f90e9bc", 972804}, {"resource.004", 0, "cd2de58e27665d5853530de93fae7cd6", 983617}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Quest for Glory 2 - English DOS // Executable scanning reports "1.000.072" @@ -2955,7 +2951,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.006", 0, "b1944bd664ddbd2859cdaa0c4a0d6281", 507489}, {"resource.007", 0, "cd2de58e27665d5853530de93fae7cd6", 490794}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Quest for Glory 2 - English DOS Non-Interactive Demo // Executable scanning reports "1.000.046" @@ -2963,7 +2959,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "e75eb86bdd517b3ef709058249986a87", 906}, {"resource.001", 0, "9b098f9e1008abe30e56c93b896494e6", 362123}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO1(GUIO_NOSPEECH) }, // Quest for Glory 3 - English DOS Non-Interactive Demo (from FRG) // Executable scanning reports "1.001.021", VERSION file reports "1.000, 0.001.059, 6.12.92" @@ -2971,7 +2967,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "fd71de9b588a45f085317caacf050e91", 687}, {"resource.000", 0, "b6c69bf6c18bf177492249fe81fc6a6d", 648702}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO1(GUIO_NOSPEECH) }, // Quest for Glory 3 - English DOS // SCI interpreter version 1.001.050 @@ -2979,7 +2975,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "19e2bf9b693932b5e2bb59b9f9ab86c9", 5958}, {"resource.000", 0, "6178ad2e83e58e4671ca03315f7a6498", 5868000}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Quest for Glory 3 - English DOS (supplied by abevi in bug report #2612718) // SCI interpreter version 1.001.050 @@ -2987,7 +2983,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "62c185d190363d7df06330fa0cc45b36", 5958}, {"resource.000", 0, "6178ad2e83e58e4671ca03315f7a6498", 5867442}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Quest for Glory 3 - English DOS (supplied by dknute in bug report #3125559) {"qfg3", "", { @@ -2995,7 +2991,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.000", 0, "6178ad2e83e58e4671ca03315f7a6498", 5868042}, {"resource.msg", 0, "27e5419c98ce444253f88c95dced14a9", 246888}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Quest for Glory 3 - German DOS (supplied by markcoolio in bug report #2723846) // Executable scanning reports "L.rry.083" @@ -3003,7 +2999,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "19e2bf9b693932b5e2bb59b9f9ab86c9", 5958}, {"resource.000", 0, "6178ad2e83e58e4671ca03315f7a6498", 5868042}, AD_LISTEND}, - Common::DE_DEU, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::DE_DEU, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Quest for Glory 3 - Spanish DOS CD (from jvprat) // Executable scanning reports "L.rry.083", VERSION file reports "1.000.000, June 30, 1994" @@ -3012,7 +3008,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.000", 0, "ba7ac86155e4c531e46cd73c86daa80a", 5884098}, {"resource.msg", 0, "a63974730d294dec0bea10057c36e506", 256014}, AD_LISTEND}, - Common::ES_ESP, Common::kPlatformPC, 0, GUIO_NONE }, + Common::ES_ESP, Common::kPlatformPC, 0, GUIO1(GUIO_NONE) }, // Quest for Glory 3 - Italian DOS // Supplied by ghoost in bug report #3053457 @@ -3021,7 +3017,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.000", 0, "6178ad2e83e58e4671ca03315f7a6498", 5868000}, {"resource.msg", 0, "5a0a896ff3e4a628db38a75eb6c84114", 259018}, AD_LISTEND}, - Common::IT_ITA, Common::kPlatformPC, 0, GUIO_NONE }, + Common::IT_ITA, Common::kPlatformPC, 0, GUIO1(GUIO_NONE) }, // Quest for Glory 4 - English DOS Non-Interactive Demo (from FRG) // SCI interpreter version 1.001.069 (just a guess) @@ -3029,7 +3025,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "1ba7c7ae1efb315326d45cb931569b1b", 922}, {"resource.000", 0, "41ba03f0b188b029132daa3ece0d3e14", 623154}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO1(GUIO_NOSPEECH) }, #ifdef ENABLE_SCI32 // Quest for Glory 4 1.1 Floppy - English DOS (supplied by markcool in bug report #2723852) @@ -3038,7 +3034,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "685bdb1ed47bbbb0e5e25db392da83ce", 9301}, {"resource.000", 0, "f64fd6aa3977939a86ff30783dd677e1", 11004993}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, GUIO1(GUIO_NOSPEECH) }, // Quest for Glory 4 1.1 Floppy - English DOS (supplied by abevi in bug report #2612718) // SCI interpreter version 2.000.000 @@ -3046,7 +3042,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "d10a4cc177d2091d744e2ad8c049b0ae", 9295}, {"resource.000", 0, "f64fd6aa3977939a86ff30783dd677e1", 11003589}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, GUIO1(GUIO_NOSPEECH) }, // Quest for Glory 4 1.1 Floppy - German DOS (supplied by markcool in bug report #2723850) // Executable scanning reports "2.000.000", VERSION file reports "1.1" @@ -3054,7 +3050,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "9e0abba8746f40565bc7eb5720522ecd", 9301}, {"resource.000", 0, "57f22cdc54eeb35fce1f26b31b5c3ee1", 11076197}, AD_LISTEND}, - Common::DE_DEU, Common::kPlatformPC, ADGF_UNSTABLE, GUIO_NOSPEECH }, + Common::DE_DEU, Common::kPlatformPC, ADGF_UNSTABLE, GUIO1(GUIO_NOSPEECH) }, // Quest for Glory 4 CD - English DOS/Windows (from jvprat) // Executable scanning reports "2.100.002", VERSION file reports "1.0" @@ -3062,7 +3058,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "aba367f2102e81782d961b14fbe3d630", 10246}, {"resource.000", 0, "263dce4aa34c49d3ad29bec889007b1c", 11571394}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_CD | ADGF_UNSTABLE, GUIO_NONE }, + Common::EN_ANY, Common::kPlatformPC, ADGF_CD | ADGF_UNSTABLE, GUIO1(GUIO_NONE) }, // RAMA - English DOS/Windows Demo // Executable scanning reports "2.100.002", VERSION file reports "000.000.008" @@ -3070,7 +3066,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resmap.001", 0, "775304e9b2a545156be4d94209550094", 1393}, {"ressci.001", 0, "259437fd75fdf51e8207fda8c01fa4fd", 2334384}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformWindows, ADGF_DEMO | ADGF_UNSTABLE, GUIO_NONE }, + Common::EN_ANY, Common::kPlatformWindows, ADGF_DEMO | ADGF_UNSTABLE, GUIO1(GUIO_NONE) }, #ifdef ENABLE_SCI3_GAMES // RAMA - English Windows (from jvprat) @@ -3083,7 +3079,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resmap.003", 0, "31ef4c0621711585d031f0ae81707251", 1636}, {"ressci.003", 0, "2a68edd064e5e4937b5e9c74b38f2082", 6860492}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE, GUIO_NONE }, + Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE, GUIO1(GUIO_NONE) }, // RAMA - English Windows (from Quietust, in bug report #2850645) {"rama", "", { @@ -3094,7 +3090,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resmap.003", 0, "48841e4b84ef1b98b48d43566fda9e13", 1636}, {"ressci.003", 0, "2a68edd064e5e4937b5e9c74b38f2082", 6870356}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE, GUIO_NONE }, + Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE, GUIO1(GUIO_NONE) }, // RAMA - Italian Windows CD (from glorifindel) // SCI interpreter version 3.000.000 (a guess?) @@ -3102,7 +3098,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"ressci.001", 0, "2a68edd064e5e4937b5e9c74b38f2082", 70611091}, {"resmap.001", 0, "70ba2ff04a2b7fb2c52420ba7fbd47c2", 8338}, AD_LISTEND}, - Common::IT_ITA, Common::kPlatformWindows, ADGF_UNSTABLE, GUIO_NONE }, + Common::IT_ITA, Common::kPlatformWindows, ADGF_UNSTABLE, GUIO1(GUIO_NONE) }, #endif // ENABLE_SCI3_GAMES // Shivers - English Windows (from jvprat) @@ -3111,14 +3107,14 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resmap.000", 0, "f2ead37749ed8f6535a2445a7d05a0cc", 46525}, {"ressci.000", 0, "4294c6d7510935f2e0a52e302073c951", 262654836}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE, GUIO_NONE }, + Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE, GUIO1(GUIO_NONE) }, // Shivers - German Windows (from Tobis87) {"shivers", "", { {"resmap.000", 0, "f483d0a1f78334c18052e92785c3086e", 46537}, {"ressci.000", 0, "6751b144671e2deed919eb9d284b07eb", 262390692}, AD_LISTEND}, - Common::DE_DEU, Common::kPlatformWindows, ADGF_UNSTABLE, GUIO_NONE }, + Common::DE_DEU, Common::kPlatformWindows, ADGF_UNSTABLE, GUIO1(GUIO_NONE) }, // Shivers - English Windows Demo // Executable scanning reports "2.100.002" @@ -3126,7 +3122,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resmap.000", 0, "d9e0bc5eddefcbe47f528760085d8927", 1186}, {"ressci.000", 0, "3a93c6340b54e07e65d0e5583354d186", 10505469}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformWindows, ADGF_DEMO | ADGF_UNSTABLE, GUIO_NONE }, + Common::EN_ANY, Common::kPlatformWindows, ADGF_DEMO | ADGF_UNSTABLE, GUIO1(GUIO_NONE) }, // Shivers 2 doesn't contain SCI scripts. The whole game logic has // been reimplemented from SCI in native code placed in DLL files. @@ -3144,7 +3140,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resmap.000", 0, "d8659188b84beaef076bd869837cd530", 634}, {"ressci.000", 0, "7fbac0807a044c9543e8ac376d200e59", 4925003}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformWindows, ADGF_DEMO | ADGF_UNSTABLE, GUIO_NONE }, + Common::EN_ANY, Common::kPlatformWindows, ADGF_DEMO | ADGF_UNSTABLE, GUIO1(GUIO_NONE) }, // Shivers 2 - English Windows (from abevi) // VERSION.TXT Version 1.0 (3/25/97) @@ -3152,7 +3148,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"ressci.001", 0, "a79d03d6eb75be0a79324f14e3d2ace4", 95346793}, {"resmap.001", 0, "a4804d436d90c4ec2e46b537f5e954db", 6268}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE, GUIO1(GUIO_NOSPEECH) }, #endif @@ -3165,7 +3161,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.msg", 0, "1aeafe2b495de288d002109650b66614", 1364}, {"resource.000", 0, "8e10d4f05c1fd9f883384fa38a898489", 377394}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO1(GUIO_NOSPEECH) }, // Slater & Charlie Go Camping - English DOS/Windows {"slater", "", { @@ -3173,7 +3169,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "21f85414124dc23e54544a5536dc35cd", 4044}, {"resource.msg", 0, "c44f51fb955eae266fecf360ebcd5ad2", 1132}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Slater & Charlie Go Camping - English DOS/Windows (Sierra Originals) @@ -3182,7 +3178,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "21f85414124dc23e54544a5536dc35cd", 4044}, {"resource.msg", 0, "c44f51fb955eae266fecf360ebcd5ad2", 1132}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Space Quest 1 VGA Remake - English Amiga (from www.back2roots.org) // SCI interpreter version 1.000.510 (just a guess) @@ -3195,7 +3191,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.004", 0, "b25a1539c71701f7715f738c5037e9a6", 775515}, {"resource.005", 0, "640ffe1a9acde392cc33cc1b1a528328", 806324}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO1(GUIO_NOSPEECH) }, // Space Quest 1 VGA Remake - English DOS (from the Space Quest Collection) // Executable scanning reports "T.A00.081", VERSION file reports "2.000" @@ -3208,7 +3204,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.003", 0, "c47600e50c6fc591957ae0c5020ee7b8", 1213262}, {"resource.004", 0, "e19ea4ad131472f9238590f2e1d40289", 1203051}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Space Quest 1 VGA Remake - English Mac (from Fingolfin) {"sq1sci", "SCI", { @@ -3219,7 +3215,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.003", 0, "ae46e195e66df5a131917f0aa80b5669", 1242794}, {"resource.004", 0, "91d58a9eb2187c38424990afe4c12bc6", 1250949}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformMacintosh, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformMacintosh, 0, GUIO1(GUIO_NOSPEECH) }, // Space Quest 1 VGA Remake - English Non-Interactive Demo (from FRG) // SCI interpreter version 1.000.181 @@ -3227,7 +3223,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "5af709ac5e0e923e0b8174f49978c30e", 636}, {"resource.001", 0, "fd99ea43f57576ded7c86036996346cf", 507642}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO1(GUIO_NOSPEECH) }, // Space Quest 1 VGA Remake - Spanish DOS Floppy (from jvprat) // Executable scanning reports "T.A00.081", VERSION file reports "2.000" @@ -3241,7 +3237,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.004", 0, "9b78228ad4f9f335fedf74f1812dcfca", 513325}, {"resource.005", 0, "7d4ebcb745c0bf8fc42e4013f52ecd49", 1101812}, AD_LISTEND}, - Common::ES_ESP, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::ES_ESP, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Space Quest I 2.0 EGA DOS (6 x 3.5" disks) // Provided by ssburnout in bug report #3046805 @@ -3254,7 +3250,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.004", 0, "975c6e81194ae6b65e960a248129ecaa", 684119}, {"resource.005", 0, "13d96f7905637552c0647175ff816145", 695589}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Space Quest 3 - English Amiga (from www.back2roots.org) // SCI interpreter version 0.000.453 (just a guess) @@ -3265,7 +3261,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.003", 0, "ceeda7202b96e5c85ecaa88a40a540fc", 746496}, {"resource.004", 0, "ceeda7202b96e5c85ecaa88a40a540fc", 761984}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO1(GUIO_NOSPEECH) }, // Space Quest 3 - German Amiga (also includes english language) // Executable scanning reports "1.004.006" @@ -3278,7 +3274,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.004", 0, "6d8f34090503ce937e7dbef6cb6cdb6a", 545053}, {"resource.005", 0, "6d8f34090503ce937e7dbef6cb6cdb6a", 687507}, AD_LISTEND}, - Common::DE_DEU, Common::kPlatformAmiga, ADGF_ADDENGLISH, GUIO_NOSPEECH }, + Common::DE_DEU, Common::kPlatformAmiga, ADGF_ADDENGLISH, GUIO1(GUIO_NOSPEECH) }, // Space Quest 3 - English DOS Non-Interactive Demo // SCI interpreter version 0.000.453 @@ -3286,7 +3282,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "ec66ac2b1ce58b2575ba00b65058de1a", 612}, {"resource.001", 0, "ceeda7202b96e5c85ecaa88a40a540fc", 180245}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO1(GUIO_NOSPEECH) }, // Space Quest 3 - English DOS (provided by richiefs in bug report #2670691) // SCI interpreter version 0.000.453 @@ -3296,7 +3292,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.002", 0, "ceeda7202b96e5c85ecaa88a40a540fc", 720244}, {"resource.003", 0, "ceeda7202b96e5c85ecaa88a40a540fc", 688367}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Space Quest 3 - English DOS (from the Space Quest Collection) // Executable scanning reports "0.000.685", VERSION file reports "1.018" @@ -3306,7 +3302,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.002", 0, "8b55c4875298f45ea5696a5ee8f6a7fe", 715777}, {"resource.003", 0, "8b55c4875298f45ea5696a5ee8f6a7fe", 703370}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Space Quest 3 - English DOS (from abevi, bug report #2612718) {"sq3", "", { @@ -3318,7 +3314,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.005", 0, "ceeda7202b96e5c85ecaa88a40a540fc", 328278}, {"resource.006", 0, "ceeda7202b96e5c85ecaa88a40a540fc", 356702}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Space Quest 3 - English Mac (from Fingolfin) {"sq3", "", { @@ -3327,7 +3323,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.002", 0, "0d8dfe42683b46f3131823233a91ce6a", 794072}, {"resource.003", 0, "0d8dfe42683b46f3131823233a91ce6a", 776536}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformMacintosh, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformMacintosh, 0, GUIO1(GUIO_NOSPEECH) }, // Space Quest 3 - German DOS (from Tobis87, also includes english language) // SCI interpreter version 0.000.453 (?) @@ -3341,7 +3337,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.006", 0, "9107c2aa5398e28b5c5406df13491f85", 320643}, {"resource.007", 0, "9107c2aa5398e28b5c5406df13491f85", 344287}, AD_LISTEND}, - Common::DE_DEU, Common::kPlatformPC, ADGF_ADDENGLISH, GUIO_NOSPEECH }, + Common::DE_DEU, Common::kPlatformPC, ADGF_ADDENGLISH, GUIO1(GUIO_NOSPEECH) }, // Space Quest 3 v1.052 - German DOS (supplied by markcoolio in bug report #2723860, also includes english language) // Executable scanning reports "S.old.114" @@ -3351,7 +3347,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.002", 0, "9107c2aa5398e28b5c5406df13491f85", 596768}, {"resource.003", 0, "9107c2aa5398e28b5c5406df13491f85", 693573}, AD_LISTEND}, - Common::DE_DEU, Common::kPlatformPC, ADGF_ADDENGLISH, GUIO_NOSPEECH }, + Common::DE_DEU, Common::kPlatformPC, ADGF_ADDENGLISH, GUIO1(GUIO_NOSPEECH) }, // Space Quest 4 - English Amiga // Executable scanning reports "1.004.024" @@ -3366,7 +3362,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.005", 0, "3540d1cc84d674cf4b2c898b88a3b563", 790296}, {"resource.006", 0, "ade814bc4d56244c156d9e9bcfebbc11", 664085}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO1(GUIO_NOSPEECH) }, // Space Quest 4 - German Amiga (from www.back2roots.org, also includes english language) // SCI interpreter version 1.000.200 (just a guess) @@ -3380,7 +3376,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.005", 0, "10ee1709e6559c724676d058199b75b5", 818745}, {"resource.006", 0, "67fb188b191d88efe8414af6ea297b93", 672675}, AD_LISTEND}, - Common::DE_DEU, Common::kPlatformAmiga, ADGF_ADDENGLISH, GUIO_NOSPEECH }, + Common::DE_DEU, Common::kPlatformAmiga, ADGF_ADDENGLISH, GUIO1(GUIO_NOSPEECH) }, // Space Quest 4 - English DOS - THIS VERSION IS PIRATED/CRACKED AND REPACKAGED =DO NOT RE-ADD= // Executable scanning reports "1.000.753" @@ -3389,7 +3385,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "a18088c8aceb06025dbc945f29e02935", 5124}, {"resource.000", 0, "e1f46832cd2458796028e054a0466031", 5502009}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_PIRATED, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, ADGF_PIRATED, GUIO1(GUIO_NOSPEECH) }, // Space Quest 4 - English DOS // Executable scanning reports "1.000.753" @@ -3398,7 +3394,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "71ccf4f82ac4efb588731acfb7bf2603", 5646}, {"resource.000", 0, "e1f46832cd2458796028e054a0466031", 933928}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Space Quest 4 1.052 - English DOS Floppy (supplied by markcoolio in bug report #2723865) // Executable scanning reports "1.000.753" @@ -3412,7 +3408,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.004", 0, "ff9c87da3bc53473fdee8b9d3edbc93c", 1200631}, {"resource.005", 0, "e33019ac19f755ae33fbf49b4fc9066c", 1053294}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Space Quest 4 1.000 - English DOS Floppy (from abevi, bug report #2612718) {"sq4", "", { @@ -3424,7 +3420,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.004", 0, "c06350184a490c10eb4585fff0aa3192", 1254368}, {"resource.005", 0, "b8d6efbd3235329bfe844c794097b2c9", 1098717}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Space Quest IV DOS 1.060 EGA (6 x 3.5" disks) // Supplied by ssburnout in bug report #3046781 @@ -3437,7 +3433,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.004", 0, "9a673e33c3f6dd560b993ffed77eeb49", 534994}, {"resource.005", 0, "3c4841d0a3ebba4404af588c93620c22", 595465}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Space Quest 4 - German DOS (from Tobis87, also includes english language) // SCI interpreter version 1.000.200 (just a guess) @@ -3451,7 +3447,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.005", 0, "47ee647b5b12232d27e63cc627c25899", 1156765}, {"resource.006", 0, "dfb023e4e2a1e7a00fa18f9ede72a91b", 924059}, AD_LISTEND}, - Common::DE_DEU, Common::kPlatformPC, ADGF_ADDENGLISH, GUIO_NOSPEECH }, + Common::DE_DEU, Common::kPlatformPC, ADGF_ADDENGLISH, GUIO1(GUIO_NOSPEECH) }, // Space Quest 4 - Italian DOS Floppy (from glorifindel, also includes english language) // SCI interpreter version 1.000.200 (just a guess) @@ -3464,7 +3460,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.004", 0, "4277c61bed40a50dadc4b5a344520af2", 1251000}, {"resource.005", 0, "5f885abd335978e2fd4e5f886d7676c8", 1102880}, AD_LISTEND}, - Common::IT_ITA, Common::kPlatformPC, ADGF_ADDENGLISH, GUIO_NOSPEECH }, + Common::IT_ITA, Common::kPlatformPC, ADGF_ADDENGLISH, GUIO1(GUIO_NOSPEECH) }, // Space Quest 4 - Japanese PC-98 5.25" Floppy (also includes english language) // SCI interpreter version 1.000.1068 @@ -3474,7 +3470,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.001", 0, "454684e3a7a68cbca073945e50778447", 1187088}, {"resource.002", 0, "6dc668326cc22cb9e8bd8ca9e68d2a66", 1181249}, AD_LISTEND}, - Common::JA_JPN, Common::kPlatformPC98, ADGF_ADDENGLISH, GUIO_NOSPEECH }, + Common::JA_JPN, Common::kPlatformPC98, ADGF_ADDENGLISH, GUIO1(GUIO_NOSPEECH) }, // Space Quest 4 - Japanese PC-98 5.25" Floppy (also includes english language) // SCI interpreter version 1.000.1068 @@ -3484,7 +3480,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.001", 0, "454684e3a7a68cbca073945e50778447", 1187088}, {"resource.002", 0, "6dc668326cc22cb9e8bd8ca9e68d2a66", 1181249}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC98, ADGF_ADDENGLISH, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC98, ADGF_ADDENGLISH, GUIO1(GUIO_NOSPEECH) }, // Space Quest 4 - English DOS CD (from the Space Quest Collection) // Executable scanning reports "1.001.064", VERSION file reports "1.0" @@ -3492,7 +3488,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "ed90a8e3ccc53af6633ff6ab58392bae", 7054}, {"resource.000", 0, "63247e3901ab8963d4eece73747832e0", 5157378}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_CD, GUIO_NONE }, + Common::EN_ANY, Common::kPlatformPC, ADGF_CD, GUIO1(GUIO_NONE) }, // Space Quest 4 - English Windows CD (from the Space Quest Collection) // Executable scanning reports "1.001.064", VERSION file reports "1.0" @@ -3502,7 +3498,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "ed90a8e3ccc53af6633ff6ab58392bae", 7054}, {"resource.000", 0, "63247e3901ab8963d4eece73747832e0", 5157378}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformWindows, ADGF_CD, GUIO_MIDIGM }, + Common::EN_ANY, Common::kPlatformWindows, ADGF_CD, GUIO1(GUIO_MIDIGM) }, // Space Quest 4 - Spanish DOS CD (from jvprat, is still text only, not talkie, also includes english language) // Executable scanning reports "1.SQ4.057", VERSION file reports "1.000" @@ -3516,7 +3512,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.004", 0, "776fba81c110d1908776232cbe190e20", 1253752}, {"resource.005", 0, "55fae26c2a92f16ef72c1e216e827c0f", 1098328}, AD_LISTEND}, - Common::ES_ESP, Common::kPlatformPC, ADGF_ADDENGLISH, GUIO_NONE }, + Common::ES_ESP, Common::kPlatformPC, ADGF_ADDENGLISH, GUIO1(GUIO_NONE) }, // Space Quest 4 - Spanish DOS Floppy (from jvprat, also includes english language) // Executable scanning reports "1.SQ4.056", VERSION file reports "1.000" @@ -3528,7 +3524,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.002", 0, "74c62fa2146ff3b3b2ea2b3fb95b9af9", 1140801}, {"resource.003", 0, "42a307941edeb1a3be31daeb2e4be90b", 1088408}, AD_LISTEND}, - Common::ES_ESP, Common::kPlatformPC, ADGF_ADDENGLISH, GUIO_NOSPEECH }, + Common::ES_ESP, Common::kPlatformPC, ADGF_ADDENGLISH, GUIO1(GUIO_NOSPEECH) }, // Space Quest 4 1.000 - German DOS Floppy (supplied by markcoolio in bug report #2723862, also includes english language) // Executable scanning reports "1.SQ4.030" @@ -3542,7 +3538,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.004", 0, "c06350184a490c10eb4585fff0aa3192", 1254368}, {"resource.005", 0, "b8d6efbd3235329bfe844c794097b2c9", 1098717}, AD_LISTEND}, - Common::DE_DEU, Common::kPlatformPC, ADGF_ADDENGLISH, GUIO_NOSPEECH }, + Common::DE_DEU, Common::kPlatformPC, ADGF_ADDENGLISH, GUIO1(GUIO_NOSPEECH) }, // Space Quest 4 - English Macintosh // Executable scanning reports "x.yyy.zzz" @@ -3557,7 +3553,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.005", 0, "869d16cab6641c80b06f4dcee18f86bc", 1426228}, {"resource.006", 0, "91d23407bc0447a3722fbeb952d7edee", 1402451}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformMacintosh, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformMacintosh, 0, GUIO1(GUIO_NOSPEECH) }, // Space Quest 4 - Russian DOS // Executable scanning reports "1.000.753", VERSION file reports "1.994" @@ -3570,7 +3566,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.004", 0, "2763fe4f0cb74df716ec8b0c464b0988", 1217428}, {"resource.005", 0, "d608713197c5ba1cd8c6ed46299c3069", 1057924}, AD_LISTEND}, - Common::RU_RUS, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::RU_RUS, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Space Quest 5 - English DOS (from the Space Quest Collection) // Executable scanning reports "1.001.068", VERSION file reports "1.04" @@ -3579,7 +3575,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.000", 0, "4147edc5045e6d62998018b5614c58ec", 5496486}, {"resource.msg", 0, "bb8ad78793c26bdb3f77498b1d6515a9", 125988}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Space Quest 5 - English DOS - THIS IS THE UNOFFICIAL BETA VERSION, WHICH IS OBVIOUSLY PIRATED AND CONTAINS MANY BUGS // ffs. http://www.akril15.com/sr/sq5alt/sq5alt.html =DO NOT RE-ADD= @@ -3588,7 +3584,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "8bde0a9adb9a3e9aaa861826874c9834", 6473}, {"resource.000", 0, "f4a48705764544d7cc64a7bb22a610df", 6025184}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_PIRATED, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, ADGF_PIRATED, GUIO1(GUIO_NOSPEECH) }, // Space Quest 5 v1.04 - German DOS (from Tobis87, updated information by markcool from bug reports #2723935 and #2724762) // SCI interpreter version 1.001.068 @@ -3597,7 +3593,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.000", 0, "4147edc5045e6d62998018b5614c58ec", 5496486}, {"resource.msg", 0, "7c71cfc36153cfe07b450423a51f7e68", 146282}, AD_LISTEND}, - Common::DE_DEU, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::DE_DEU, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Space Quest 5 v1.04 - French DOS (from Hkz, Included in Space Quest Collector's Edition, with chapters I-V) {"sq5", "", { @@ -3605,7 +3601,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.000", 0, "4147edc5045e6d62998018b5614c58ec", 5496486}, {"resource.msg", 0, "877c42380320eb1db7dad83ccd261214", 140374}, AD_LISTEND}, - Common::FR_FRA, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::FR_FRA, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Space Quest 5 - Italian DOS Floppy (from glorifindel) // SCI interpreter version 1.001.068 (just a guess) @@ -3613,7 +3609,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.000", 0, "5040026519f37199f3616fb1d4704dff", 6047170}, {"resource.map", 0, "5b09168baa2f6e2e22787429b2d72f54", 6492}, AD_LISTEND}, - Common::IT_ITA, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::IT_ITA, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Space Quest 5 - Spanish DOS Floppy (from mirir, bug report #3090664) {"sq5", "", { @@ -3621,7 +3617,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "5714a899033bdebf2d61ad333c8c6637", 6492}, {"resource.msg", 0, "46deca7ef9cf057f7d442df98c1a2ae2", 134612}, AD_LISTEND}, - Common::ES_ESP, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::ES_ESP, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // Space Quest 5 - Russian DOS // Executable scanning reports "1.001.068", VERSION file reports "1.994" @@ -3630,7 +3626,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.000", 0, "6f9ed21e1001526b4137f6703ed476af", 6103778}, {"resource.msg", 0, "0a8931990cd2eac1691602391c68ab85", 147580}, AD_LISTEND}, - Common::RU_RUS, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::RU_RUS, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, #ifdef ENABLE_SCI32 // Space Quest 6 - English DOS/Win3.11 CD (from the Space Quest Collection) @@ -3639,7 +3635,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "6dddfa3a8f3a3a513ec9dfdfae955005", 10528}, {"resource.000", 0, "c4259ab7355aead07773397b1052827d", 41150806}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_CD | ADGF_UNSTABLE, GUIO_NONE }, + Common::EN_ANY, Common::kPlatformPC, ADGF_CD | ADGF_UNSTABLE, GUIO1(GUIO_NONE) }, // Space Quest 6 - English DOS/Win3.11 CD ver 1.11 (from FRG) // SCI interpreter version 2.100.002 (just a guess) @@ -3647,7 +3643,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "e0615d6e4e10e37ae42e6a2a95aaf145", 10528}, {"resource.000", 0, "c4259ab7355aead07773397b1052827d", 41150806}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_CD | ADGF_UNSTABLE, GUIO_NONE }, + Common::EN_ANY, Common::kPlatformPC, ADGF_CD | ADGF_UNSTABLE, GUIO1(GUIO_NONE) }, // Space Quest 6 - French DOS/Win3.11 CD (from French magazine Joystick - September 1997) // Executable scanning reports "2.100.002", VERSION file reports "1.0" @@ -3655,7 +3651,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "3c831625931d5079b73ae8c275f52c95", 10534}, {"resource.000", 0, "4195ca940f759424f62b90e262cc1737", 40932397}, AD_LISTEND}, - Common::FR_FRA, Common::kPlatformPC, ADGF_CD | ADGF_UNSTABLE, GUIO_NONE }, + Common::FR_FRA, Common::kPlatformPC, ADGF_CD | ADGF_UNSTABLE, GUIO1(GUIO_NONE) }, // Space Quest 6 - German DOS (from Tobis87, updated info from markcoolio in bug report #2723884) // SCI interpreter version 2.100.002 (just a guess) @@ -3663,7 +3659,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "664d797415484f85c90b1b45aedc7686", 10534}, {"resource.000", 0, "ba87ba91e5bdabb4169dd0df75777722", 40933685}, AD_LISTEND}, - Common::DE_DEU, Common::kPlatformPC, ADGF_CD | ADGF_UNSTABLE, GUIO_NONE }, + Common::DE_DEU, Common::kPlatformPC, ADGF_CD | ADGF_UNSTABLE, GUIO1(GUIO_NONE) }, // Space Quest 6 - English DOS/Win3.11 Interactive Demo (from FRG) // SCI interpreter version 2.100.002 (just a guess) @@ -3671,7 +3667,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "368f07b07433db3f819fa3fa0e5efee5", 2572}, {"resource.000", 0, "ab12724e078dea34b624e0d2a38dcd7c", 2272050}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO | ADGF_UNSTABLE, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO | ADGF_UNSTABLE, GUIO1(GUIO_NOSPEECH) }, #endif // ENABLE_SCI32 // The Island of Dr. Brain - English DOS CD (from jvprat) @@ -3680,7 +3676,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "2388efef8430b041b0f3b00b9050e4a2", 3281}, {"resource.000", 0, "b3acd9b9dd7fe53c4ee133ac9a1acfab", 2103560}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NONE }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NONE) }, // The Island of Dr. Brain - English DOS (from Quietust) // Executable scanning reports "1.001.053", VERSION file reports "1.1 2.3.93" @@ -3688,7 +3684,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "3c07da06bdd1689f9d07af78fb94d0ec", 3101}, {"resource.000", 0, "ecc686e0034fb4d41de077ac7167b3cf", 1947866}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH) }, // The Island of Dr. Brain - English DOS Non-Interactive Demo // SCI interpreter version 1.001.053 (just a guess) @@ -3696,7 +3692,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "a8e5ca8ed1996974afa59f4c45e06195", 986}, {"resource.000", 0, "b3acd9b9dd7fe53c4ee133ac9a1acfab", 586560}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO1(GUIO_NOSPEECH) }, #ifdef ENABLE_SCI32 // Torin's Passage - English Windows Interactive Demo @@ -3705,7 +3701,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resmap.000", 0, "9a3e172cde9963d0a969f26469318cec", 3403}, {"ressci.000", 0, "db3e290481c35c3224e9602e71e4a1f1", 5073868}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformWindows, ADGF_DEMO | ADGF_UNSTABLE, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformWindows, ADGF_DEMO | ADGF_UNSTABLE, GUIO1(GUIO_NOSPEECH) }, // Torin's Passage - English Windows // SCI interpreter version 2.100.002 (just a guess) @@ -3713,7 +3709,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resmap.000", 0, "bb3b0b22ff08df54fbe2d06263409be6", 9799}, {"ressci.000", 0, "693a259d346c9360f4a0c11fdaae430a", 55973887}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE, GUIO_NOSPEECH }, + Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE, GUIO1(GUIO_NOSPEECH) }, // Torin's Passage - Spanish Windows (from jvprat) // Executable scanning reports "2.100.002", VERSION file reports "1.0" @@ -3722,7 +3718,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"ressci.000", 0, "693a259d346c9360f4a0c11fdaae430a", 55973887}, // TODO: depend on one of the patches? AD_LISTEND}, - Common::ES_ESP, Common::kPlatformWindows, ADGF_UNSTABLE, GUIO_NOSPEECH }, + Common::ES_ESP, Common::kPlatformWindows, ADGF_UNSTABLE, GUIO1(GUIO_NOSPEECH) }, // Torin's Passage - French Windows // SCI interpreter version 2.100.002 (just a guess) @@ -3730,7 +3726,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resmap.000", 0, "bb3b0b22ff08df54fbe2d06263409be6", 9799}, {"ressci.000", 0, "693a259d346c9360f4a0c11fdaae430a", 55973887}, AD_LISTEND}, - Common::FR_FRA, Common::kPlatformWindows, ADGF_UNSTABLE, GUIO_NOSPEECH }, + Common::FR_FRA, Common::kPlatformWindows, ADGF_UNSTABLE, GUIO1(GUIO_NOSPEECH) }, // Torin's Passage - German Windows // SCI interpreter version 2.100.002 (just a guess) @@ -3738,7 +3734,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resmap.000", 0, "bb3b0b22ff08df54fbe2d06263409be6", 9799}, {"ressci.000", 0, "693a259d346c9360f4a0c11fdaae430a", 55973887}, AD_LISTEND}, - Common::DE_DEU, Common::kPlatformWindows, ADGF_UNSTABLE, GUIO_NOSPEECH }, + Common::DE_DEU, Common::kPlatformWindows, ADGF_UNSTABLE, GUIO1(GUIO_NOSPEECH) }, // Torin's Passage - Italian Windows CD (from glorifindel) // SCI interpreter version 2.100.002 (just a guess) @@ -3746,7 +3742,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resmap.000", 0, "bb3b0b22ff08df54fbe2d06263409be6", 9799}, {"ressci.000", 0, "693a259d346c9360f4a0c11fdaae430a", 55973887}, AD_LISTEND}, - Common::IT_ITA, Common::kPlatformWindows, ADGF_UNSTABLE, GUIO_NONE }, + Common::IT_ITA, Common::kPlatformWindows, ADGF_UNSTABLE, GUIO1(GUIO_NONE) }, #endif // ENABLE_SCI32 // SCI Fanmade Games diff --git a/engines/sky/detection.cpp b/engines/sky/detection.cpp index a1067496da..2699500527 100644 --- a/engines/sky/detection.cpp +++ b/engines/sky/detection.cpp @@ -43,21 +43,21 @@ struct SkyVersion { int dataDiskSize; const char *extraDesc; int version; - uint32 guioptions; + const char *guioptions; }; // TODO: Would be nice if Disk::determineGameVersion() used this table, too. static const SkyVersion skyVersions[] = { - { 232, -1, "floppy demo", 272, Common::GUIO_NOSPEECH }, // German - { 243, -1, "pc gamer demo", 109, Common::GUIO_NOSPEECH }, - { 247, -1, "floppy demo", 267, Common::GUIO_NOSPEECH }, // English - { 1404, -1, "floppy", 288, Common::GUIO_NOSPEECH }, - { 1413, -1, "floppy", 303, Common::GUIO_NOSPEECH }, - { 1445, 8830435, "floppy", 348, Common::GUIO_NOSPEECH }, - { 1445, -1, "floppy", 331, Common::GUIO_NOSPEECH }, - { 1711, -1, "cd demo", 365, Common::GUIO_NONE }, - { 5099, -1, "cd", 368, Common::GUIO_NONE }, - { 5097, -1, "cd", 372, Common::GUIO_NONE }, + { 232, -1, "floppy demo", 272, GUIO1(GUIO_NOSPEECH) }, // German + { 243, -1, "pc gamer demo", 109, GUIO1(GUIO_NOSPEECH) }, + { 247, -1, "floppy demo", 267, GUIO1(GUIO_NOSPEECH) }, // English + { 1404, -1, "floppy", 288, GUIO1(GUIO_NOSPEECH) }, + { 1413, -1, "floppy", 303, GUIO1(GUIO_NOSPEECH) }, + { 1445, 8830435, "floppy", 348, GUIO1(GUIO_NOSPEECH) }, + { 1445, -1, "floppy", 331, GUIO1(GUIO_NOSPEECH) }, + { 1711, -1, "cd demo", 365, GUIO1(GUIO_NONE) }, + { 5099, -1, "cd", 368, GUIO1(GUIO_NONE) }, + { 5097, -1, "cd", 372, GUIO1(GUIO_NONE) }, { 0, 0, 0, 0, 0 } }; diff --git a/engines/sword1/detection.cpp b/engines/sword1/detection.cpp index e4c068e667..9d9f198f8b 100644 --- a/engines/sword1/detection.cpp +++ b/engines/sword1/detection.cpp @@ -117,12 +117,12 @@ bool Sword1::SwordEngine::hasFeature(EngineFeature f) const { GameList SwordMetaEngine::getSupportedGames() const { GameList games; - games.push_back(GameDescriptor(sword1FullSettings, Common::GUIO_NOMIDI)); - games.push_back(GameDescriptor(sword1DemoSettings, Common::GUIO_NOMIDI)); - games.push_back(GameDescriptor(sword1MacFullSettings, Common::GUIO_NOMIDI)); - games.push_back(GameDescriptor(sword1MacDemoSettings, Common::GUIO_NOMIDI)); - games.push_back(GameDescriptor(sword1PSXSettings, Common::GUIO_NOMIDI)); - games.push_back(GameDescriptor(sword1PSXDemoSettings, Common::GUIO_NOMIDI)); + games.push_back(GameDescriptor(sword1FullSettings, GUIO_NOMIDI)); + games.push_back(GameDescriptor(sword1DemoSettings, GUIO_NOMIDI)); + games.push_back(GameDescriptor(sword1MacFullSettings, GUIO_NOMIDI)); + games.push_back(GameDescriptor(sword1MacDemoSettings, GUIO_NOMIDI)); + games.push_back(GameDescriptor(sword1PSXSettings, GUIO_NOMIDI)); + games.push_back(GameDescriptor(sword1PSXDemoSettings, GUIO_NOMIDI)); return games; } @@ -198,17 +198,17 @@ GameList SwordMetaEngine::detectGames(const Common::FSList &fslist) const { psxDemoFilesFound = false; if (mainFilesFound && pcFilesFound && demoFilesFound) - detectedGames.push_back(GameDescriptor(sword1DemoSettings, Common::GUIO_NOMIDI)); + detectedGames.push_back(GameDescriptor(sword1DemoSettings, GUIO1(GUIO_NOMIDI))); else if (mainFilesFound && pcFilesFound && psxFilesFound) - detectedGames.push_back(GameDescriptor(sword1PSXSettings, Common::GUIO_NOMIDI)); + detectedGames.push_back(GameDescriptor(sword1PSXSettings, GUIO1(GUIO_NOMIDI))); else if (mainFilesFound && pcFilesFound && psxDemoFilesFound) - detectedGames.push_back(GameDescriptor(sword1PSXDemoSettings, Common::GUIO_NOMIDI)); + detectedGames.push_back(GameDescriptor(sword1PSXDemoSettings, GUIO1(GUIO_NOMIDI))); else if (mainFilesFound && pcFilesFound && !psxFilesFound) - detectedGames.push_back(GameDescriptor(sword1FullSettings, Common::GUIO_NOMIDI)); + detectedGames.push_back(GameDescriptor(sword1FullSettings, GUIO1(GUIO_NOMIDI))); else if (mainFilesFound && macFilesFound) - detectedGames.push_back(GameDescriptor(sword1MacFullSettings, Common::GUIO_NOMIDI)); + detectedGames.push_back(GameDescriptor(sword1MacFullSettings, GUIO1(GUIO_NOMIDI))); else if (mainFilesFound && macDemoFilesFound) - detectedGames.push_back(GameDescriptor(sword1MacDemoSettings, Common::GUIO_NOMIDI)); + detectedGames.push_back(GameDescriptor(sword1MacDemoSettings, GUIO1(GUIO_NOMIDI))); return detectedGames; } diff --git a/engines/sword2/sword2.cpp b/engines/sword2/sword2.cpp index 87c7c12ad6..b4d4f52a12 100644 --- a/engines/sword2/sword2.cpp +++ b/engines/sword2/sword2.cpp @@ -145,7 +145,7 @@ GameList Sword2MetaEngine::detectGames(const Common::FSList &fslist) const { if (0 == scumm_stricmp(g->detectname, fileName)) { // Match found, add to list of candidates, then abort inner loop. - detectedGames.push_back(GameDescriptor(g->gameid, g->description, Common::UNK_LANG, Common::kPlatformUnknown, Common::GUIO_NOMIDI)); + detectedGames.push_back(GameDescriptor(g->gameid, g->description, Common::UNK_LANG, Common::kPlatformUnknown, GUIO1(GUIO_NOMIDI))); break; } } diff --git a/engines/sword25/detection.cpp b/engines/sword25/detection.cpp index 25a3df167b..06e4ba2a7d 100644 --- a/engines/sword25/detection.cpp +++ b/engines/sword25/detection.cpp @@ -44,7 +44,7 @@ static const char *directoryGlobs[] = { class Sword25MetaEngine : public AdvancedMetaEngine { public: Sword25MetaEngine() : AdvancedMetaEngine(Sword25::gameDescriptions, sizeof(ADGameDescription), sword25Game) { - _guioptions = Common::GUIO_NOMIDI; + _guioptions = GUIO1(GUIO_NOMIDI); _maxScanDepth = 2; _directoryGlobs = directoryGlobs; } diff --git a/engines/sword25/detection_tables.h b/engines/sword25/detection_tables.h index fe9e6e7934..5e0473dee5 100644 --- a/engines/sword25/detection_tables.h +++ b/engines/sword25/detection_tables.h @@ -22,11 +22,6 @@ namespace Sword25 { -using Common::GUIO_NONE; -using Common::GUIO_NOSPEECH; -using Common::GUIO_NOSFX; -using Common::GUIO_NOMUSIC; - static const ADGameDescription gameDescriptions[] = { { "sword25", @@ -35,7 +30,7 @@ static const ADGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformUnknown, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, { "sword25", @@ -44,7 +39,7 @@ static const ADGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformUnknown, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, { "sword25", @@ -53,7 +48,7 @@ static const ADGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformUnknown, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, { "sword25", @@ -62,7 +57,7 @@ static const ADGameDescription gameDescriptions[] = { Common::HU_HUN, Common::kPlatformUnknown, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, { "sword25", @@ -71,7 +66,7 @@ static const ADGameDescription gameDescriptions[] = { Common::IT_ITA, Common::kPlatformUnknown, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, { "sword25", @@ -80,7 +75,7 @@ static const ADGameDescription gameDescriptions[] = { Common::PL_POL, Common::kPlatformUnknown, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, { "sword25", @@ -89,7 +84,7 @@ static const ADGameDescription gameDescriptions[] = { Common::PT_BRA, Common::kPlatformUnknown, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, { "sword25", @@ -98,7 +93,7 @@ static const ADGameDescription gameDescriptions[] = { Common::RU_RUS, Common::kPlatformUnknown, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, { "sword25", @@ -107,7 +102,7 @@ static const ADGameDescription gameDescriptions[] = { Common::ES_ESP, Common::kPlatformUnknown, ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, // Extracted version @@ -121,7 +116,7 @@ static const ADGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformUnknown, GF_EXTRACTED | ADGF_UNSTABLE, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, AD_TABLE_END_MARKER }; diff --git a/engines/teenagent/detection.cpp b/engines/teenagent/detection.cpp index 5db1919823..cf58df1344 100644 --- a/engines/teenagent/detection.cpp +++ b/engines/teenagent/detection.cpp @@ -54,7 +54,7 @@ static const ADGameDescription teenAgentGameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, - Common::GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, { "teenagent", @@ -74,7 +74,7 @@ static const ADGameDescription teenAgentGameDescriptions[] = { Common::CZ_CZE, Common::kPlatformPC, ADGF_CD, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, AD_TABLE_END_MARKER, }; diff --git a/engines/testbed/detection.cpp b/engines/testbed/detection.cpp index b869bb8ebb..356d75f7ea 100644 --- a/engines/testbed/detection.cpp +++ b/engines/testbed/detection.cpp @@ -40,7 +40,7 @@ static const ADGameDescription testbedDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, AD_TABLE_END_MARKER }; diff --git a/engines/tinsel/detection_tables.h b/engines/tinsel/detection_tables.h index bea0938fad..64a0af8404 100644 --- a/engines/tinsel/detection_tables.h +++ b/engines/tinsel/detection_tables.h @@ -22,11 +22,6 @@ namespace Tinsel { -using Common::GUIO_NONE; -using Common::GUIO_NOSPEECH; -using Common::GUIO_NOSFX; -using Common::GUIO_NOMUSIC; - static const TinselGameDescription gameDescriptions[] = { // Note: The following is the (hopefully) definitive list of version details: @@ -48,7 +43,7 @@ static const TinselGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, - GUIO_NOSPEECH | GUIO_NOSFX | GUIO_NOMUSIC + GUIO3(GUIO_NOSPEECH, GUIO_NOSFX, GUIO_NOMUSIC) }, GID_DW1, 0, @@ -67,7 +62,7 @@ static const TinselGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_DW1, 0, @@ -87,7 +82,7 @@ static const TinselGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformMacintosh, ADGF_DEMO, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_DW1, 0, @@ -111,7 +106,7 @@ static const TinselGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformPC, ADGF_DROPLANGUAGE, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GID_DW1, 0, @@ -134,7 +129,7 @@ static const TinselGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_DROPLANGUAGE, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GID_DW1, 0, @@ -157,7 +152,7 @@ static const TinselGameDescription gameDescriptions[] = { Common::IT_ITA, Common::kPlatformPC, ADGF_DROPLANGUAGE, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GID_DW1, 0, @@ -180,7 +175,7 @@ static const TinselGameDescription gameDescriptions[] = { Common::ES_ESP, Common::kPlatformPC, ADGF_DROPLANGUAGE, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GID_DW1, 0, @@ -196,7 +191,7 @@ static const TinselGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NOSPEECH + GUIO1(GUIO_NOSPEECH) }, GID_DW1, 0, @@ -215,7 +210,7 @@ static const TinselGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_CD, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_DW1, 0, @@ -237,7 +232,7 @@ static const TinselGameDescription gameDescriptions[] = { Common::IT_ITA, Common::kPlatformPC, ADGF_DROPLANGUAGE | ADGF_CD, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_DW1, 0, @@ -262,7 +257,7 @@ static const TinselGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformPC, ADGF_DROPLANGUAGE | ADGF_CD, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_DW1, 0, @@ -286,7 +281,7 @@ static const TinselGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_DROPLANGUAGE | ADGF_CD, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_DW1, 0, @@ -309,7 +304,7 @@ static const TinselGameDescription gameDescriptions[] = { Common::IT_ITA, Common::kPlatformPC, ADGF_DROPLANGUAGE | ADGF_CD, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_DW1, 0, @@ -332,7 +327,7 @@ static const TinselGameDescription gameDescriptions[] = { Common::ES_ESP, Common::kPlatformPC, ADGF_DROPLANGUAGE | ADGF_CD, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_DW1, 0, @@ -352,7 +347,7 @@ static const TinselGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_CD, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_DW1, 0, @@ -372,7 +367,7 @@ static const TinselGameDescription gameDescriptions[] = { Common::HE_ISR, Common::kPlatformPC, ADGF_CD, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_DW1, 0, @@ -391,7 +386,7 @@ static const TinselGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPSX, ADGF_CD, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_DW1, 0, @@ -414,7 +409,7 @@ static const TinselGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPSX, ADGF_DEMO, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_DW1, 0, @@ -435,7 +430,7 @@ static const TinselGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_CD, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_DW1, 0, @@ -457,7 +452,7 @@ static const TinselGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformMacintosh, ADGF_CD, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_DW1, 0, @@ -476,7 +471,7 @@ static const TinselGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_CD, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_DW1, 0, @@ -497,7 +492,7 @@ static const TinselGameDescription gameDescriptions[] = { Common::RU_RUS, Common::kPlatformPC, ADGF_CD, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_DW1, 0, @@ -517,7 +512,7 @@ static const TinselGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_DW2, 0, @@ -537,7 +532,7 @@ static const TinselGameDescription gameDescriptions[] = { Common::EN_GRB, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_DW2, 0, @@ -557,7 +552,7 @@ static const TinselGameDescription gameDescriptions[] = { Common::EN_USA, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_DW2, 0, @@ -577,7 +572,7 @@ static const TinselGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_DW2, 0, @@ -597,7 +592,7 @@ static const TinselGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_DW2, 0, @@ -618,7 +613,7 @@ static const TinselGameDescription gameDescriptions[] = { Common::IT_ITA, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_DW2, 0, @@ -638,7 +633,7 @@ static const TinselGameDescription gameDescriptions[] = { Common::ES_ESP, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_DW2, 0, @@ -659,7 +654,7 @@ static const TinselGameDescription gameDescriptions[] = { Common::RU_RUS, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, GID_DW2, 0, diff --git a/engines/toon/detection.cpp b/engines/toon/detection.cpp index ac4caae8b2..2afcb589b7 100644 --- a/engines/toon/detection.cpp +++ b/engines/toon/detection.cpp @@ -35,8 +35,6 @@ static const PlainGameDescriptor toonGames[] = { namespace Toon { -using Common::GUIO_NONE; - static const ADGameDescription gameDescriptions[] = { { "toon", "", @@ -46,7 +44,7 @@ static const ADGameDescription gameDescriptions[] = { {"study.svl", 0, "281efa3f33f6712c0f641a605f4d40fd", 2511090}, AD_LISTEND }, - Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, GUIO_NONE + Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, GUIO1(GUIO_NONE) }, { "toon", "", @@ -56,7 +54,7 @@ static const ADGameDescription gameDescriptions[] = { {"study.svl", 0, "df056b94ea83f1ed92a539cf636053ab", 2542668}, AD_LISTEND }, - Common::FR_FRA, Common::kPlatformPC, ADGF_NO_FLAGS, GUIO_NONE + Common::FR_FRA, Common::kPlatformPC, ADGF_NO_FLAGS, GUIO1(GUIO_NONE) }, { "toon", "", @@ -66,7 +64,7 @@ static const ADGameDescription gameDescriptions[] = { {"study.svl", 0, "72fe96a9e10967d3138e918295babc42", 2910283}, AD_LISTEND }, - Common::DE_DEU, Common::kPlatformPC, ADGF_NO_FLAGS, GUIO_NONE + Common::DE_DEU, Common::kPlatformPC, ADGF_NO_FLAGS, GUIO1(GUIO_NONE) }, { "toon", "", @@ -76,7 +74,7 @@ static const ADGameDescription gameDescriptions[] = { {"study.svl", 0, "b6b1ee2d9d94d53d305856039ab7bde7", 2634620}, AD_LISTEND }, - Common::ES_ESP, Common::kPlatformPC, ADGF_NO_FLAGS, GUIO_NONE + Common::ES_ESP, Common::kPlatformPC, ADGF_NO_FLAGS, GUIO1(GUIO_NONE) }, { "toon", "", @@ -86,7 +84,7 @@ static const ADGameDescription gameDescriptions[] = { {"generic.svl", 0, "5eb99850ada22f0b8cf6392262d4dd07", 9404599}, AD_LISTEND }, - Common::DE_DEU, Common::kPlatformPC, ADGF_DEMO, GUIO_NONE + Common::DE_DEU, Common::kPlatformPC, ADGF_DEMO, GUIO1(GUIO_NONE) }, { "toon", "", @@ -95,7 +93,7 @@ static const ADGameDescription gameDescriptions[] = { {"generic.svl", 0, "5c42724bb93b360dca7044d6b7ef26e5", 7739319}, AD_LISTEND }, - Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NONE + Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO1(GUIO_NONE) }, AD_TABLE_END_MARKER diff --git a/engines/touche/detection.cpp b/engines/touche/detection.cpp index 0684144473..a42d765056 100644 --- a/engines/touche/detection.cpp +++ b/engines/touche/detection.cpp @@ -37,8 +37,6 @@ static const PlainGameDescriptor toucheGames[] = { namespace Touche { -using Common::GUIO_NONE; - static const ADGameDescription gameDescriptions[] = { { // retail version "touche", @@ -47,7 +45,7 @@ static const ADGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, { // retail version - tracker item #1601818 "touche", @@ -56,7 +54,7 @@ static const ADGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, { // retail version "touche", @@ -65,7 +63,7 @@ static const ADGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, { // retail version - tracker item #1598643 "touche", @@ -74,7 +72,7 @@ static const ADGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, { // retail version - tracker item #1681643 "touche", @@ -83,7 +81,7 @@ static const ADGameDescription gameDescriptions[] = { Common::ES_ESP, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, { // fan-made translation (http://www.iagtg.net/) - tracker item #1602360 "touche", @@ -92,7 +90,7 @@ static const ADGameDescription gameDescriptions[] = { Common::IT_ITA, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, { // retail version - tracker item #1800500 "touche", @@ -101,7 +99,7 @@ static const ADGameDescription gameDescriptions[] = { Common::PL_POL, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GUIO_NONE) }, { // demo version "touche", @@ -110,7 +108,7 @@ static const ADGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, - GUIO_NONE + GUIO1(GUIO_NONE) }, AD_TABLE_END_MARKER }; diff --git a/engines/tsage/detection.cpp b/engines/tsage/detection.cpp index ba01e024e5..12add10c58 100644 --- a/engines/tsage/detection.cpp +++ b/engines/tsage/detection.cpp @@ -76,7 +76,7 @@ public: TSageMetaEngine() : AdvancedMetaEngine(TsAGE::gameDescriptions, sizeof(TsAGE::tSageGameDescription), tSageGameTitles) { _md5Bytes = 5000; _singleid = "tsage"; - _guioptions = Common::GUIO_NOSPEECH; + _guioptions = GUIO1(GUIO_NOSPEECH); } virtual const char *getName() const { diff --git a/engines/tsage/detection_tables.h b/engines/tsage/detection_tables.h index fdd7adc85d..360dbac0ae 100644 --- a/engines/tsage/detection_tables.h +++ b/engines/tsage/detection_tables.h @@ -33,7 +33,7 @@ static const tSageGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_CD, - Common::GUIO_NOSPEECH | Common::GUIO_NOSFX + GUIO2(GUIO_NOSPEECH, GUIO_NOSFX) }, GType_Ringworld, GF_CD | GF_ALT_REGIONS @@ -47,7 +47,7 @@ static const tSageGameDescription gameDescriptions[] = { Common::ES_ESP, Common::kPlatformPC, ADGF_CD, - Common::GUIO_NOSPEECH | Common::GUIO_NOSFX + GUIO2(GUIO_NOSPEECH, GUIO_NOSFX) }, GType_Ringworld, GF_CD | GF_ALT_REGIONS @@ -61,7 +61,7 @@ static const tSageGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, - Common::GUIO_NOSPEECH | Common::GUIO_NOSFX + GUIO2(GUIO_NOSPEECH, GUIO_NOSFX) }, GType_Ringworld, GF_FLOPPY @@ -75,7 +75,7 @@ static const tSageGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, - Common::GUIO_NOSPEECH | Common::GUIO_NOSFX + GUIO2(GUIO_NOSPEECH, GUIO_NOSFX) }, GType_Ringworld, GF_FLOPPY | GF_DEMO @@ -90,7 +90,7 @@ static const tSageGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, - Common::GUIO_NOSPEECH | Common::GUIO_NOSFX + GUIO2(GUIO_NOSPEECH, GUIO_NOSFX) }, GType_Ringworld, GF_FLOPPY | GF_DEMO | GF_ALT_REGIONS @@ -106,7 +106,7 @@ static const tSageGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, - Common::GUIO_NOSPEECH | Common::GUIO_NOSFX + GUIO2(GUIO_NOSPEECH, GUIO_NOSFX) }, GType_BlueForce, GF_FLOPPY @@ -121,7 +121,7 @@ static const tSageGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, - Common::GUIO_NOSPEECH | Common::GUIO_NOSFX + GUIO2(GUIO_NOSPEECH, GUIO_NOSFX) }, GType_BlueForce, GF_FLOPPY | GF_ALT_REGIONS @@ -135,7 +135,7 @@ static const tSageGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_CD | ADGF_UNSTABLE, - Common::GUIO_NOSPEECH | Common::GUIO_NOSFX + GUIO2(GUIO_NOSPEECH, GUIO_NOSFX) }, GType_BlueForce, GF_CD | GF_ALT_REGIONS @@ -150,7 +150,7 @@ static const tSageGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_CD | ADGF_UNSTABLE, - Common::GUIO_NOSPEECH | Common::GUIO_NOSFX + GUIO2(GUIO_NOSPEECH, GUIO_NOSFX) }, GType_Ringworld2, GF_CD | GF_ALT_REGIONS diff --git a/engines/tucker/detection.cpp b/engines/tucker/detection.cpp index 4a3313e3f7..77c84b281c 100644 --- a/engines/tucker/detection.cpp +++ b/engines/tucker/detection.cpp @@ -43,7 +43,7 @@ static const ADGameDescription tuckerGameDescriptions[] = { Common::FR_FRA, Common::kPlatformPC, Tucker::kGameFlagNoSubtitles, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, { "tucker", @@ -52,7 +52,7 @@ static const ADGameDescription tuckerGameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, Tucker::kGameFlagEncodedData, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, { "tucker", @@ -61,7 +61,7 @@ static const ADGameDescription tuckerGameDescriptions[] = { Common::ES_ESP, Common::kPlatformPC, Tucker::kGameFlagEncodedData, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, { "tucker", @@ -70,7 +70,7 @@ static const ADGameDescription tuckerGameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, Tucker::kGameFlagEncodedData, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, { "tucker", @@ -79,7 +79,7 @@ static const ADGameDescription tuckerGameDescriptions[] = { Common::PL_POL, Common::kPlatformPC, 0, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, { "tucker", @@ -88,7 +88,7 @@ static const ADGameDescription tuckerGameDescriptions[] = { Common::CZ_CZE, Common::kPlatformPC, Tucker::kGameFlagEncodedData, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, { "tucker", @@ -97,7 +97,7 @@ static const ADGameDescription tuckerGameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO | Tucker::kGameFlagDemo, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, AD_TABLE_END_MARKER }; @@ -109,7 +109,7 @@ static const ADGameDescription tuckerDemoGameDescription = { Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO | Tucker::kGameFlagDemo | Tucker::kGameFlagIntroOnly, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }; class TuckerMetaEngine : public AdvancedMetaEngine { |