From bab4b6f7295f6fb960ebbf44b009bd6adbd0d33e Mon Sep 17 00:00:00 2001 From: Strangerke Date: Wed, 16 Nov 2011 22:38:58 +0100 Subject: LAUNCHER: Introduce GUIO0() in order to replace GUIO1(GUIO_NONE) --- common/util.h | 1 + engines/advancedDetector.h | 2 +- engines/agi/detection_tables.h | 18 +++++----- engines/agos/detection_tables.h | 44 ++++++++++++------------- engines/cge/detection.cpp | 12 +++---- engines/cine/detection_tables.h | 66 ++++++++++++++++++------------------- engines/cruise/detection.cpp | 22 ++++++------- engines/draci/detection.cpp | 8 ++--- engines/drascula/detection.cpp | 26 +++++++-------- engines/dreamweb/detection_tables.h | 18 +++++----- engines/gob/detection_tables.h | 24 +++++++------- engines/hugo/detection.cpp | 12 +++---- engines/kyra/detection_tables.h | 6 ++-- engines/lure/detection.cpp | 16 ++++----- engines/m4/detection.cpp | 10 +++--- engines/made/detection.cpp | 32 +++++++++--------- engines/saga/detection_tables.h | 20 +++++------ engines/sci/detection.cpp | 4 +-- engines/sci/detection_tables.h | 52 ++++++++++++++--------------- engines/scumm/detection.cpp | 2 +- engines/scumm/detection_tables.h | 6 ++-- engines/sky/detection.cpp | 6 ++-- engines/teenagent/detection.cpp | 2 +- engines/testbed/detection.cpp | 2 +- engines/tinsel/detection_tables.h | 30 ++++++++--------- engines/toon/detection.cpp | 12 +++---- engines/touche/detection.cpp | 16 ++++----- engines/tucker/detection.cpp | 16 ++++----- 28 files changed, 243 insertions(+), 242 deletions(-) diff --git a/common/util.h b/common/util.h index f8d4c3b385..c9ff83c1cf 100644 --- a/common/util.h +++ b/common/util.h @@ -101,6 +101,7 @@ template inline void SWAP(T &a, T &b) { T tmp = a; a = b; b = tmp; } #define GUIO_NOASPECT "\021" #define GUIO_EGAUNDITHER "\022" +#define GUIO0() (GUIO_NONE) #define GUIO1(a) (a) #define GUIO2(a,b) (a b) #define GUIO3(a,b,c) (a b c) diff --git a/engines/advancedDetector.h b/engines/advancedDetector.h index 9a6b5e4ef7..c31c8bd66e 100644 --- a/engines/advancedDetector.h +++ b/engines/advancedDetector.h @@ -101,7 +101,7 @@ typedef Common::Array 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, GUIO1(GUIO_NONE) } + { NULL, NULL, { { NULL, 0, NULL, 0 } }, Common::UNK_LANG, Common::kPlatformUnknown, ADGF_NO_FLAGS, GUIO0() } struct ADFileBasedFallback { /** diff --git a/engines/agi/detection_tables.h b/engines/agi/detection_tables.h index 081cb39668..ab0e9a1fe4 100644 --- a/engines/agi/detection_tables.h +++ b/engines/agi/detection_tables.h @@ -30,7 +30,7 @@ namespace Agi { lang, \ platform, \ ADGF_NO_FLAGS, \ - GUIO1(GUIO_NONE) \ + GUIO0() \ }, \ gid, \ interp, \ @@ -46,7 +46,7 @@ namespace Agi { lang, \ platform, \ ADGF_USEEXTRAASTITLE, \ - GUIO1(GUIO_NONE) \ + GUIO0() \ }, \ gid, \ interp, \ @@ -130,7 +130,7 @@ static const AGIGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, GID_BC, GType_V1, @@ -151,7 +151,7 @@ static const AGIGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, GID_BC, GType_V1, @@ -172,7 +172,7 @@ static const AGIGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, GID_BC, GType_V1, @@ -252,7 +252,7 @@ static const AGIGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformMacintosh, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, GID_GOLDRUSH, GType_V3, @@ -570,7 +570,7 @@ static const AGIGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformAmiga, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, GID_SQ2, GType_V2, @@ -859,7 +859,7 @@ static const AGIGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_USEEXTRAASTITLE, - GUIO1(GUIO_NONE) + GUIO0() }, GID_FANMADE, GType_V3, @@ -887,7 +887,7 @@ static AGIGameDescription g_fallbackDesc = { Common::UNK_LANG, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, GID_FANMADE, GType_V2, diff --git a/engines/agos/detection_tables.h b/engines/agos/detection_tables.h index a006766728..7fe6df5f17 100644 --- a/engines/agos/detection_tables.h +++ b/engines/agos/detection_tables.h @@ -1591,7 +1591,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::RU_RUS, Common::kPlatformPC, ADGF_CD, - GUIO1(GUIO_NONE) + GUIO0() }, GType_SIMON1, @@ -1616,7 +1616,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformPC, ADGF_CD, - GUIO1(GUIO_NONE) + GUIO0() }, GType_SIMON1, @@ -1666,7 +1666,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::HE_ISR, Common::kPlatformPC, ADGF_CD, - GUIO1(GUIO_NONE) + GUIO0() }, GType_SIMON1, @@ -1691,7 +1691,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::IT_ITA, Common::kPlatformPC, ADGF_CD, - GUIO1(GUIO_NONE) + GUIO0() }, GType_SIMON1, @@ -1717,7 +1717,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::IT_ITA, Common::kPlatformWindows, ADGF_CD, - GUIO1(GUIO_NONE) + GUIO0() }, GType_SIMON1, @@ -1742,7 +1742,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::ES_ESP, Common::kPlatformPC, ADGF_CD, - GUIO1(GUIO_NONE) + GUIO0() }, GType_SIMON1, @@ -1942,7 +1942,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, - GUIO1(GUIO_NONE) + GUIO0() }, GType_SIMON2, @@ -1967,7 +1967,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_DEMO, - GUIO1(GUIO_NONE) + GUIO0() }, GType_SIMON2, @@ -1992,7 +1992,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_DEMO, - GUIO1(GUIO_NONE) + GUIO0() }, GType_SIMON2, @@ -2017,7 +2017,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_CD, - GUIO1(GUIO_NONE) + GUIO0() }, GType_SIMON2, @@ -2042,7 +2042,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_CD, - GUIO1(GUIO_NONE) + GUIO0() }, GType_SIMON2, @@ -2067,7 +2067,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformPC, ADGF_CD, - GUIO1(GUIO_NONE) + GUIO0() }, GType_SIMON2, @@ -2092,7 +2092,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_CD, - GUIO1(GUIO_NONE) + GUIO0() }, GType_SIMON2, @@ -2117,7 +2117,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_CD, - GUIO1(GUIO_NONE) + GUIO0() }, GType_SIMON2, @@ -2142,7 +2142,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::HE_ISR, Common::kPlatformPC, ADGF_CD, - GUIO1(GUIO_NONE) + GUIO0() }, GType_SIMON2, @@ -2168,7 +2168,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::IT_ITA, Common::kPlatformWindows, ADGF_CD, - GUIO1(GUIO_NONE) + GUIO0() }, GType_SIMON2, @@ -2193,7 +2193,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::ES_ESP, Common::kPlatformPC, ADGF_CD, - GUIO1(GUIO_NONE) + GUIO0() }, GType_SIMON2, @@ -2218,7 +2218,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::CZ_CZE, Common::kPlatformWindows, ADGF_CD, - GUIO1(GUIO_NONE) + GUIO0() }, GType_SIMON2, @@ -2243,7 +2243,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_CD, - GUIO1(GUIO_NONE) + GUIO0() }, GType_SIMON2, @@ -2268,7 +2268,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformWindows, ADGF_CD, - GUIO1(GUIO_NONE) + GUIO0() }, GType_SIMON2, @@ -2293,7 +2293,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformWindows, ADGF_CD, - GUIO1(GUIO_NONE) + GUIO0() }, GType_SIMON2, @@ -2318,7 +2318,7 @@ static const AGOSGameDescription gameDescriptions[] = { Common::PL_POL, Common::kPlatformWindows, ADGF_CD, - GUIO1(GUIO_NONE) + GUIO0() }, GType_SIMON2, diff --git a/engines/cge/detection.cpp b/engines/cge/detection.cpp index 58f84d0c3e..3fa3dbd7ff 100644 --- a/engines/cge/detection.cpp +++ b/engines/cge/detection.cpp @@ -44,7 +44,7 @@ static const ADGameDescription gameDescriptions[] = { {"vol.dat", 0, "f9ae2e7f8f7cac91378cdafca43faf1e", 8437572}, AD_LISTEND }, - Common::PL_POL, Common::kPlatformPC, ADGF_NO_FLAGS, GUIO1(GUIO_NONE) + Common::PL_POL, Common::kPlatformPC, ADGF_NO_FLAGS, GUIO0() }, { "soltys", "Soltys Freeware", @@ -53,7 +53,7 @@ static const ADGameDescription gameDescriptions[] = { {"vol.dat", 0, "f9ae2e7f8f7cac91378cdafca43faf1e", 8437676}, AD_LISTEND }, - Common::PL_POL, Common::kPlatformPC, ADGF_NO_FLAGS, GUIO1(GUIO_NONE) + Common::PL_POL, Common::kPlatformPC, ADGF_NO_FLAGS, GUIO0() }, { "soltys", "Soltys Demo (not supported)", @@ -62,7 +62,7 @@ static const ADGameDescription gameDescriptions[] = { {"vol.dat", 0, "75d385a6074c58b69f7730481f256051", 1796710}, AD_LISTEND }, - Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO , GUIO1(GUIO_NONE) + Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO , GUIO0() }, { "soltys", "Soltys Demo (not supported)", @@ -71,7 +71,7 @@ static const ADGameDescription gameDescriptions[] = { {"vol.dat", 0, "c5d9b15863cab61dc125551576dece04", 1075272}, AD_LISTEND }, - Common::PL_POL, Common::kPlatformPC, ADGF_DEMO , GUIO1(GUIO_NONE) + Common::PL_POL, Common::kPlatformPC, ADGF_DEMO , GUIO0() }, { "soltys", "Soltys Freeware v1.0", @@ -80,7 +80,7 @@ static const ADGameDescription gameDescriptions[] = { {"vol.dat", 0, "4ffeff4abc99ac5999b55ccfc56ab1df", 8430868}, AD_LISTEND }, - Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS , GUIO1(GUIO_NONE) + Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS , GUIO0() }, { "soltys", "Soltys Freeware v1.0", @@ -89,7 +89,7 @@ static const ADGameDescription gameDescriptions[] = { {"vol.dat", 0, "0e43331c846094d77f5dd201827e0a3b", 8439339}, AD_LISTEND }, - Common::PL_POL, Common::kPlatformPC, ADGF_NO_FLAGS, GUIO1(GUIO_NONE) + Common::PL_POL, Common::kPlatformPC, ADGF_NO_FLAGS, GUIO0() }, AD_TABLE_END_MARKER }; diff --git a/engines/cine/detection_tables.h b/engines/cine/detection_tables.h index c8ab63edaf..ddb63c960b 100644 --- a/engines/cine/detection_tables.h +++ b/engines/cine/detection_tables.h @@ -31,7 +31,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, GType_FW, 0, @@ -51,7 +51,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::EN_USA, Common::kPlatformPC, ADGF_CD, - GUIO1(GUIO_NONE) + GUIO0() }, GType_FW, GF_CD | GF_CRYPTED_BOOT_PRC, @@ -66,7 +66,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, GType_FW, 0, @@ -80,7 +80,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, GType_FW, GF_ALT_FONT, @@ -94,7 +94,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::ES_ESP, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, GType_FW, GF_ALT_FONT, @@ -108,7 +108,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, GType_FW, 0, @@ -122,7 +122,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformAmiga, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, GType_FW, 0, @@ -136,7 +136,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::EN_USA, Common::kPlatformAmiga, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, GType_FW, 0, @@ -150,7 +150,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformAmiga, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, GType_FW, GF_ALT_FONT, @@ -164,7 +164,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::ES_ESP, Common::kPlatformAmiga, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, GType_FW, 0, @@ -178,7 +178,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformAmiga, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, GType_FW, 0, @@ -192,7 +192,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::IT_ITA, Common::kPlatformAmiga, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, GType_FW, 0, @@ -210,7 +210,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformAmiga, ADGF_DEMO, - GUIO1(GUIO_NONE) + GUIO0() }, GType_FW, 0, @@ -224,7 +224,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformAtariST, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, GType_FW, 0, @@ -238,7 +238,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformAtariST, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, GType_FW, 0, @@ -252,7 +252,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::EN_GRB, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, GType_OS, 0, @@ -268,7 +268,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::EN_GRB, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, GType_OS, 0, @@ -282,7 +282,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::EN_USA, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, GType_OS, 0, @@ -296,7 +296,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::EN_USA, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, GType_OS, GF_CD, @@ -310,7 +310,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, GType_OS, 0, @@ -324,7 +324,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::ES_ESP, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, GType_OS, 0, @@ -342,7 +342,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::ES_ESP, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, GType_OS, GF_CD, @@ -356,7 +356,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, GType_OS, 0, @@ -370,7 +370,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::IT_ITA, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, GType_OS, 0, @@ -384,7 +384,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::EN_GRB, Common::kPlatformAmiga, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, GType_OS, 0, @@ -398,7 +398,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::EN_GRB, Common::kPlatformAmiga, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, GType_OS, 0, @@ -412,7 +412,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::EN_USA, Common::kPlatformAmiga, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, GType_OS, 0, @@ -426,7 +426,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformAmiga, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, GType_OS, 0, @@ -440,7 +440,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::ES_ESP, Common::kPlatformAmiga, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, GType_OS, 0, @@ -454,7 +454,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformAmiga, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, GType_OS, 0, @@ -468,7 +468,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::EN_GRB, Common::kPlatformAmiga, ADGF_DEMO, - GUIO1(GUIO_NONE) + GUIO0() }, GType_OS, GF_DEMO, @@ -482,7 +482,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::EN_GRB, Common::kPlatformAtariST, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, GType_OS, 0, @@ -496,7 +496,7 @@ static const CINEGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformAtariST, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, GType_OS, 0, diff --git a/engines/cruise/detection.cpp b/engines/cruise/detection.cpp index a482e263a2..eb7c1c524f 100644 --- a/engines/cruise/detection.cpp +++ b/engines/cruise/detection.cpp @@ -75,7 +75,7 @@ static const CRUISEGameDescription gameDescriptions[] = { Common::EN_GRB, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, GType_CRUISE, 0, @@ -88,7 +88,7 @@ static const CRUISEGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, GType_CRUISE, 0, @@ -101,7 +101,7 @@ static const CRUISEGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, GType_CRUISE, 0, @@ -114,7 +114,7 @@ static const CRUISEGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, GType_CRUISE, 0, @@ -127,7 +127,7 @@ static const CRUISEGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, GType_CRUISE, 0, @@ -140,7 +140,7 @@ static const CRUISEGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, GType_CRUISE, 0, @@ -153,7 +153,7 @@ static const CRUISEGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformAmiga, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, GType_CRUISE, 0, @@ -166,7 +166,7 @@ static const CRUISEGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformAmiga, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, GType_CRUISE, 0, @@ -179,7 +179,7 @@ static const CRUISEGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformAtariST, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, GType_CRUISE, 0, @@ -192,7 +192,7 @@ static const CRUISEGameDescription gameDescriptions[] = { Common::IT_ITA, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, GType_CRUISE, 0, @@ -205,7 +205,7 @@ static const CRUISEGameDescription gameDescriptions[] = { Common::ES_ESP, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, GType_CRUISE, 0, diff --git a/engines/draci/detection.cpp b/engines/draci/detection.cpp index e483e8ca9f..de76eb83e0 100644 --- a/engines/draci/detection.cpp +++ b/engines/draci/detection.cpp @@ -43,7 +43,7 @@ const ADGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, { @@ -53,7 +53,7 @@ const ADGameDescription gameDescriptions[] = { Common::CZ_CZE, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, { @@ -63,7 +63,7 @@ const ADGameDescription gameDescriptions[] = { Common::PL_POL, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, { @@ -73,7 +73,7 @@ const ADGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, AD_TABLE_END_MARKER diff --git a/engines/drascula/detection.cpp b/engines/drascula/detection.cpp index 0969ad4131..3310ac0598 100644 --- a/engines/drascula/detection.cpp +++ b/engines/drascula/detection.cpp @@ -73,7 +73,7 @@ static const DrasculaGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, }, @@ -93,7 +93,7 @@ static const DrasculaGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, GF_PACKED, - GUIO1(GUIO_NONE) + GUIO0() }, }, @@ -110,7 +110,7 @@ static const DrasculaGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, GF_PACKED, - GUIO1(GUIO_NONE) + GUIO0() }, }, @@ -127,7 +127,7 @@ static const DrasculaGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformPC, GF_PACKED, - GUIO1(GUIO_NONE) + GUIO0() }, }, @@ -140,7 +140,7 @@ static const DrasculaGameDescription gameDescriptions[] = { Common::ES_ESP, Common::kPlatformPC, GF_PACKED, - GUIO1(GUIO_NONE) + GUIO0() }, }, @@ -153,7 +153,7 @@ static const DrasculaGameDescription gameDescriptions[] = { Common::ES_ESP, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, }, @@ -166,7 +166,7 @@ static const DrasculaGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, }, @@ -179,7 +179,7 @@ static const DrasculaGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, }, @@ -192,7 +192,7 @@ static const DrasculaGameDescription gameDescriptions[] = { Common::IT_ITA, Common::kPlatformPC, GF_PACKED, - GUIO1(GUIO_NONE) + GUIO0() }, }, { @@ -204,7 +204,7 @@ static const DrasculaGameDescription gameDescriptions[] = { Common::IT_ITA, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, }, @@ -221,7 +221,7 @@ static const DrasculaGameDescription gameDescriptions[] = { Common::ES_ESP, Common::kPlatformPC, GF_PACKED, - GUIO1(GUIO_NONE) + GUIO0() }, }, @@ -238,7 +238,7 @@ static const DrasculaGameDescription gameDescriptions[] = { Common::IT_ITA, Common::kPlatformPC, GF_PACKED, - GUIO1(GUIO_NONE) + GUIO0() }, }, @@ -255,7 +255,7 @@ static const DrasculaGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformPC, GF_PACKED, - GUIO1(GUIO_NONE) + GUIO0() }, }, diff --git a/engines/dreamweb/detection_tables.h b/engines/dreamweb/detection_tables.h index 0902236916..75f5786268 100644 --- a/engines/dreamweb/detection_tables.h +++ b/engines/dreamweb/detection_tables.h @@ -39,7 +39,7 @@ static const DreamWebGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, - GUIO1(GUIO_NONE) + GUIO0() }, }, @@ -56,7 +56,7 @@ static const DreamWebGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_CD | ADGF_UNSTABLE, - GUIO1(GUIO_NONE) + GUIO0() }, }, @@ -73,7 +73,7 @@ static const DreamWebGameDescription gameDescriptions[] = { Common::EN_USA, Common::kPlatformPC, ADGF_CD, - GUIO1(GUIO_NONE) + GUIO0() }, }, @@ -90,7 +90,7 @@ static const DreamWebGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformPC, ADGF_CD | ADGF_UNSTABLE, - GUIO1(GUIO_NONE) + GUIO0() }, }, @@ -107,7 +107,7 @@ static const DreamWebGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_UNSTABLE, - GUIO1(GUIO_NONE) + GUIO0() }, }, @@ -124,7 +124,7 @@ static const DreamWebGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_CD | ADGF_UNSTABLE, - GUIO1(GUIO_NONE) + GUIO0() }, }, @@ -141,7 +141,7 @@ static const DreamWebGameDescription gameDescriptions[] = { Common::ES_ESP, Common::kPlatformPC, ADGF_UNSTABLE, - GUIO1(GUIO_NONE) + GUIO0() }, }, @@ -158,7 +158,7 @@ static const DreamWebGameDescription gameDescriptions[] = { Common::ES_ESP, Common::kPlatformPC, ADGF_CD | ADGF_UNSTABLE, - GUIO1(GUIO_NONE) + GUIO0() }, }, @@ -175,7 +175,7 @@ static const DreamWebGameDescription gameDescriptions[] = { Common::IT_ITA, Common::kPlatformPC, ADGF_UNSTABLE, - GUIO1(GUIO_NONE) + GUIO0() }, }, diff --git a/engines/gob/detection_tables.h b/engines/gob/detection_tables.h index fb4b9e170f..a88ddcc734 100644 --- a/engines/gob/detection_tables.h +++ b/engines/gob/detection_tables.h @@ -4299,7 +4299,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, kGameTypeAdi2, kFeaturesNone, @@ -4341,7 +4341,7 @@ static const GOBGameDescription gameDescriptions[] = { EN_ANY, kPlatformAmiga, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, kGameTypeAdi2, kFeaturesNone, @@ -4669,7 +4669,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, kGameTypeAdibou2, kFeaturesNone, @@ -4683,7 +4683,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, kGameTypeAdibou2, kFeaturesNone, @@ -4697,7 +4697,7 @@ static const GOBGameDescription gameDescriptions[] = { DE_DEU, kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, kGameTypeAdibou2, kFeaturesNone, @@ -4711,7 +4711,7 @@ static const GOBGameDescription gameDescriptions[] = { IT_ITA, kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, kGameTypeAdibou2, kFeaturesNone, @@ -4725,7 +4725,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, kGameTypeAdibou2, kFeaturesNone, @@ -4739,7 +4739,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, kGameTypeAdibou2, kFeaturesNone, @@ -4753,7 +4753,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, kGameTypeAdibou2, kFeaturesNone, @@ -4767,7 +4767,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, kGameTypeAdibou2, kFeaturesNone, @@ -4781,7 +4781,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, kGameTypeAdibou2, kFeaturesNone, @@ -4795,7 +4795,7 @@ static const GOBGameDescription gameDescriptions[] = { FR_FRA, kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, kGameTypeAdibou2, kFeaturesNone, diff --git a/engines/hugo/detection.cpp b/engines/hugo/detection.cpp index 43e688bba4..90708163f5 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, - GUIO1(GUIO_NONE) + GUIO0() }, kGameTypeHugo1 }, @@ -75,7 +75,7 @@ static const HugoGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, GF_PACKED, - GUIO1(GUIO_NONE) + GUIO0() }, kGameTypeHugo1 }, @@ -87,7 +87,7 @@ static const HugoGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, GF_PACKED, - GUIO1(GUIO_NONE) + GUIO0() }, kGameTypeHugo2 }, @@ -99,7 +99,7 @@ static const HugoGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, GF_PACKED, - GUIO1(GUIO_NONE) + GUIO0() }, kGameTypeHugo2 }, @@ -111,7 +111,7 @@ static const HugoGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, GF_PACKED, - GUIO1(GUIO_NONE) + GUIO0() }, kGameTypeHugo3 }, @@ -123,7 +123,7 @@ static const HugoGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, GF_PACKED, - GUIO1(GUIO_NONE) + GUIO0() }, kGameTypeHugo3 }, diff --git a/engines/kyra/detection_tables.h b/engines/kyra/detection_tables.h index 5c1e9df408..ebf7c8eee7 100644 --- a/engines/kyra/detection_tables.h +++ b/engines/kyra/detection_tables.h @@ -361,7 +361,7 @@ const KYRAGameDescription adGameDescs[] = { Common::EN_ANY, Common::kPlatformMacintosh, ADGF_CD, - GUIO1(GUIO_NONE) + GUIO0() }, KYRA1_CD_FLAGS }, @@ -377,7 +377,7 @@ const KYRAGameDescription adGameDescs[] = { Common::DE_DEU, Common::kPlatformMacintosh, ADGF_CD, - GUIO1(GUIO_NONE) + GUIO0() }, KYRA1_CD_FLAGS }, @@ -393,7 +393,7 @@ const KYRAGameDescription adGameDescs[] = { Common::FR_FRA, Common::kPlatformMacintosh, ADGF_CD, - GUIO1(GUIO_NONE) + GUIO0() }, KYRA1_CD_FLAGS }, diff --git a/engines/lure/detection.cpp b/engines/lure/detection.cpp index 276b2d77af..ab7615c265 100644 --- a/engines/lure/detection.cpp +++ b/engines/lure/detection.cpp @@ -72,7 +72,7 @@ static const LureGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, GF_FLOPPY, }, @@ -85,7 +85,7 @@ static const LureGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, GF_FLOPPY | GF_EGA, }, @@ -98,7 +98,7 @@ static const LureGameDescription gameDescriptions[] = { Common::IT_ITA, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, GF_FLOPPY, }, @@ -111,7 +111,7 @@ static const LureGameDescription gameDescriptions[] = { Common::IT_ITA, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, GF_FLOPPY | GF_EGA, }, @@ -124,7 +124,7 @@ static const LureGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, GF_FLOPPY, }, @@ -137,7 +137,7 @@ static const LureGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, GF_FLOPPY, }, @@ -150,7 +150,7 @@ static const LureGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, GF_FLOPPY, }, @@ -163,7 +163,7 @@ static const LureGameDescription gameDescriptions[] = { Common::ES_ESP, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, GF_FLOPPY, }, diff --git a/engines/m4/detection.cpp b/engines/m4/detection.cpp index a10ac512ad..6b8af6b5f2 100644 --- a/engines/m4/detection.cpp +++ b/engines/m4/detection.cpp @@ -269,7 +269,7 @@ static const M4GameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO | ADGF_UNSTABLE, - GUIO1(GUIO_NONE) + GUIO0() }, GType_RexNebular, kFeaturesDemo @@ -302,7 +302,7 @@ static const M4GameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, - GUIO1(GUIO_NONE) + GUIO0() }, GType_DragonSphere, kFeaturesCD @@ -318,7 +318,7 @@ static const M4GameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO | ADGF_UNSTABLE, - GUIO1(GUIO_NONE) + GUIO0() }, GType_DragonSphere, kFeaturesDemo @@ -350,7 +350,7 @@ static const M4GameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_UNSTABLE, - GUIO1(GUIO_NONE) + GUIO0() }, GType_Phantom, kFeaturesCD @@ -366,7 +366,7 @@ static const M4GameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO | ADGF_UNSTABLE, - GUIO1(GUIO_NONE) + GUIO0() }, GType_Phantom, kFeaturesDemo diff --git a/engines/made/detection.cpp b/engines/made/detection.cpp index d3da7012ef..2591e92af3 100644 --- a/engines/made/detection.cpp +++ b/engines/made/detection.cpp @@ -80,7 +80,7 @@ static const MadeGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, GID_RTZ, 0, @@ -98,7 +98,7 @@ static const MadeGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_CD, - GUIO1(GUIO_NONE) + GUIO0() }, GID_RTZ, 0, @@ -115,7 +115,7 @@ static const MadeGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_CD, - GUIO1(GUIO_NONE) + GUIO0() }, GID_RTZ, 0, @@ -132,7 +132,7 @@ static const MadeGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_CD, - GUIO1(GUIO_NONE) + GUIO0() }, GID_RTZ, 0, @@ -150,7 +150,7 @@ static const MadeGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_CD, - GUIO1(GUIO_NONE) + GUIO0() }, GID_RTZ, 0, @@ -167,7 +167,7 @@ static const MadeGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_CD, - GUIO1(GUIO_NONE) + GUIO0() }, GID_RTZ, 0, @@ -185,7 +185,7 @@ static const MadeGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_CD, - GUIO1(GUIO_NONE) + GUIO0() }, GID_RTZ, 0, @@ -203,7 +203,7 @@ static const MadeGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_CD, - GUIO1(GUIO_NONE) + GUIO0() }, GID_RTZ, 0, @@ -221,7 +221,7 @@ static const MadeGameDescription gameDescriptions[] = { Common::IT_ITA, Common::kPlatformPC, ADGF_CD, - GUIO1(GUIO_NONE) + GUIO0() }, GID_RTZ, 0, @@ -239,7 +239,7 @@ static const MadeGameDescription gameDescriptions[] = { Common::IT_ITA, Common::kPlatformPC, ADGF_CD, - GUIO1(GUIO_NONE) + GUIO0() }, GID_RTZ, 0, @@ -257,7 +257,7 @@ static const MadeGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformPC, ADGF_CD, - GUIO1(GUIO_NONE) + GUIO0() }, GID_RTZ, 0, @@ -275,7 +275,7 @@ static const MadeGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformPC, ADGF_CD, - GUIO1(GUIO_NONE) + GUIO0() }, GID_RTZ, 0, @@ -309,7 +309,7 @@ static const MadeGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, - GUIO1(GUIO_NONE) + GUIO0() }, GID_RTZ, 0, @@ -327,7 +327,7 @@ static const MadeGameDescription gameDescriptions[] = { Common::JA_JPN, Common::kPlatformPC, ADGF_CD, - GUIO1(GUIO_NONE) + GUIO0() }, GID_RTZ, 0, @@ -363,7 +363,7 @@ static const MadeGameDescription gameDescriptions[] = { Common::JA_JPN, Common::kPlatformPC98, ADGF_CD, - GUIO1(GUIO_NONE) + GUIO0() }, GID_RTZ, 0, @@ -508,7 +508,7 @@ static MadeGameDescription g_fallbackDesc = { Common::UNK_LANG, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, 0, 0, diff --git a/engines/saga/detection_tables.h b/engines/saga/detection_tables.h index 10393c4a2a..234a10acfe 100644 --- a/engines/saga/detection_tables.h +++ b/engines/saga/detection_tables.h @@ -267,7 +267,7 @@ static const SAGAGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_DEMO, - GUIO1(GUIO_NONE) + GUIO0() }, GID_ITE, 0, @@ -293,7 +293,7 @@ static const SAGAGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_DEMO, - GUIO1(GUIO_NONE) + GUIO0() }, GID_ITE, GF_8BIT_UNSIGNED_PCM, @@ -326,7 +326,7 @@ static const SAGAGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformMacintosh, ADGF_CD, - GUIO1(GUIO_NONE) + GUIO0() }, GID_ITE, GF_8BIT_UNSIGNED_PCM, @@ -350,7 +350,7 @@ static const SAGAGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformMacintosh, ADGF_CD, - GUIO1(GUIO_NONE) + GUIO0() }, GID_ITE, 0, @@ -382,7 +382,7 @@ static const SAGAGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformUnknown, ADGF_CD, - GUIO1(GUIO_NONE) + GUIO0() }, GID_ITE, 0, @@ -412,7 +412,7 @@ static const SAGAGameDescription gameDescriptions[] = { Common::IT_ITA, Common::kPlatformUnknown, ADGF_CD, - GUIO1(GUIO_NONE) + GUIO0() }, GID_ITE, 0, @@ -436,7 +436,7 @@ static const SAGAGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_CD, - GUIO1(GUIO_NONE) + GUIO0() }, GID_ITE, GF_EXTRA_ITE_CREDITS, @@ -460,7 +460,7 @@ static const SAGAGameDescription gameDescriptions[] = { Common::IT_ITA, Common::kPlatformPC, ADGF_CD, - GUIO1(GUIO_NONE) + GUIO0() }, GID_ITE, 0, @@ -484,7 +484,7 @@ static const SAGAGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_CD, - GUIO1(GUIO_NONE) + GUIO0() }, GID_ITE, 0, @@ -509,7 +509,7 @@ static const SAGAGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_CD, - GUIO1(GUIO_NONE) + GUIO0() }, GID_ITE, 0, diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp index 2d567a7fde..80f45b4325 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, - GUIO1(GUIO_NONE) + GUIO0() }; 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 = GUIO1(GUIO_NONE); + s_fallbackDesc.guioptions = GUIO0(); if (allFiles.contains("resource.map") || allFiles.contains("Data1") || allFiles.contains("resmap.001") || allFiles.contains("resmap.001")) { diff --git a/engines/sci/detection_tables.h b/engines/sci/detection_tables.h index 2f89a34f54..69f0afdbb4 100644 --- a/engines/sci/detection_tables.h +++ b/engines/sci/detection_tables.h @@ -427,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, GUIO1(GUIO_NONE) }, + Common::EN_ANY, Common::kPlatformPC, ADGF_CD, GUIO0() }, // Eco Quest - English DOS CD 1.1 // SCI interpreter version 1.001.064 @@ -541,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, GUIO1(GUIO_NONE) }, + Common::EN_ANY, Common::kPlatformPC, ADGF_CD, GUIO0() }, // Freddy Pharkas - English DOS Floppy (updated information from markcoolio in bug reports #2723773 and #2724720) // Executable scanning reports "1.cfs.081" @@ -583,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, GUIO1(GUIO_NONE) }, + Common::ES_ESP, Common::kPlatformPC, ADGF_CD, GUIO0() }, // Freddy Pharkas - Spanish DOS (from jvprat) // Executable scanning reports "1.cfs.081", VERSION file reports "1.000, March 30, 1995" @@ -601,7 +601,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "a62a7eae85dd1e6b07f39662b278437e", 1918}, {"resource.000", 0, "4962a3c4dd44e36e78ea4a7a374c2220", 957382}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO1(GUIO_NONE) }, + Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO0() }, // Freddy Pharkas - English Macintosh {"freddypharkas", "", { @@ -624,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, GUIO1(GUIO_NONE) }, + Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO0() }, #ifdef ENABLE_SCI32 // Gabriel Knight - English DOS Floppy @@ -665,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, GUIO1(GUIO_NONE) }, + Common::EN_ANY, Common::kPlatformPC, ADGF_CD | ADGF_UNSTABLE, GUIO0() }, // Gabriel Knight - English Windows CD (from jvprat) // Executable scanning reports "2.000.000", VERSION file reports "01.100.000" @@ -681,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, GUIO1(GUIO_NONE) }, + Common::DE_DEU, Common::kPlatformPC, ADGF_CD | ADGF_UNSTABLE, GUIO0() }, // Gabriel Knight - Spanish DOS CD (from jvprat) // Executable scanning reports "2.000.000", VERSION file reports "1.000.000, April 13, 1995" @@ -689,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, GUIO1(GUIO_NONE) }, + Common::ES_ESP, Common::kPlatformPC, ADGF_CD | ADGF_UNSTABLE, GUIO0() }, // Gabriel Knight - French DOS CD (from Hkz) // VERSION file reports "1.000.000, May 3, 1994" @@ -697,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, GUIO1(GUIO_NONE) }, + Common::FR_FRA, Common::kPlatformPC, ADGF_CD | ADGF_UNSTABLE, GUIO0() }, // Gabriel Knight - German Windows CD (from Tobis87) // SCI interpreter version 2.000.000 @@ -990,7 +990,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "459f5b04467bc2107aec02f5c4b71b37", 4878}, {"resource.001", 0, "3876da2ce16fb7dea2f5d943d946fa84", 1652150}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, ADGF_CD, GUIO1(GUIO_NONE) }, + Common::EN_ANY, Common::kPlatformPC, ADGF_CD, GUIO0() }, // Jones in the Fast Lane - English DOS CD // Same entry as the DOS version above. This one is used for the alternate @@ -1201,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, GUIO1(GUIO_NONE) }, + Common::EN_ANY, Common::kPlatformPC, ADGF_CD, GUIO0() }, // 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" @@ -1437,7 +1437,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, GUIO1(GUIO_NONE) }, + Common::EN_ANY, Common::kPlatformPC, ADGF_CD, GUIO0() }, // 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" @@ -1456,7 +1456,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, GUIO1(GUIO_NONE) }, + Common::ES_ESP, Common::kPlatformPC, ADGF_CD, GUIO0() }, // King's Quest 6 - English Macintosh Floppy // VERSION file reports "1.0" @@ -1611,7 +1611,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, GUIO1(GUIO_NONE) }, + Common::EN_ANY, Common::kPlatformPC, ADGF_CD, GUIO0() }, // Laura Bow 2 v1.1 - French DOS Floppy (from Hkz) {"laurabow2", "", { @@ -1637,7 +1637,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, GUIO1(GUIO_NONE) }, + Common::ES_ESP, Common::kPlatformPC, ADGF_CD, GUIO0() }, // Larry 1 EGA Remake - English DOS (from spookypeanut) // SCI interpreter version 0.000.510 (or 0.000.577?) @@ -2070,7 +2070,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, GUIO1(GUIO_NONE) }, + Common::EN_ANY, Common::kPlatformPC, ADGF_CD, GUIO0() }, // Larry 6 - German DOS CD - LOWRES (provided by richiefs in bug report #2670691) // SCI interpreter version 1.001.115 @@ -2078,7 +2078,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, GUIO1(GUIO_NONE) }, + Common::DE_DEU, Common::kPlatformPC, ADGF_CD, GUIO0() }, // Larry 6 - French DOS CD - LOWRES (provided by richiefs in bug report #2670691) // SCI interpreter version 1.001.115 @@ -2086,7 +2086,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, GUIO1(GUIO_NONE) }, + Common::FR_FRA, Common::kPlatformPC, ADGF_CD, GUIO0() }, // 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" @@ -2335,7 +2335,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, GUIO1(GUIO_NONE) }, + Common::EN_ANY, Common::kPlatformPC, ADGF_CD, GUIO0() }, // Mixed-Up Mother Goose - English Windows Interactive Demo // Executable scanning reports "x.yyy.zzz" @@ -2671,7 +2671,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, GUIO1(GUIO_NONE) }, + Common::EN_ANY, Common::kPlatformPC, ADGF_CD | ADGF_UNSTABLE, GUIO0() }, // Police Quest 4 - German DOS CD (German text, English speech) // Supplied by markcoolio in bug report #3392955 @@ -2679,7 +2679,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, GUIO1(GUIO_NONE) }, + Common::DE_DEU, Common::kPlatformPC, ADGF_CD | ADGF_UNSTABLE, GUIO0() }, // Police Quest 4 - English DOS // SCI interpreter version 2.000.000 (a guess?) @@ -3019,7 +3019,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.000", 0, "ba7ac86155e4c531e46cd73c86daa80a", 5884098}, {"resource.msg", 0, "a63974730d294dec0bea10057c36e506", 256014}, AD_LISTEND}, - Common::ES_ESP, Common::kPlatformPC, 0, GUIO1(GUIO_NONE) }, + Common::ES_ESP, Common::kPlatformPC, 0, GUIO0() }, // Quest for Glory 3 - Italian DOS // Supplied by ghoost in bug report #3053457 @@ -3028,7 +3028,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.000", 0, "6178ad2e83e58e4671ca03315f7a6498", 5868000}, {"resource.msg", 0, "5a0a896ff3e4a628db38a75eb6c84114", 259018}, AD_LISTEND}, - Common::IT_ITA, Common::kPlatformPC, 0, GUIO1(GUIO_NONE) }, + Common::IT_ITA, Common::kPlatformPC, 0, GUIO0() }, // Quest for Glory 4 - English DOS Non-Interactive Demo (from FRG) // SCI interpreter version 1.001.069 (just a guess) @@ -3499,7 +3499,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, GUIO1(GUIO_NONE) }, + Common::EN_ANY, Common::kPlatformPC, ADGF_CD, GUIO0() }, // Space Quest 4 - English Windows CD (from the Space Quest Collection) // Executable scanning reports "1.001.064", VERSION file reports "1.0" @@ -3523,7 +3523,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, GUIO1(GUIO_NONE) }, + Common::ES_ESP, Common::kPlatformPC, ADGF_ADDENGLISH, GUIO0() }, // Space Quest 4 - Spanish DOS Floppy (from jvprat, also includes english language) // Executable scanning reports "1.SQ4.056", VERSION file reports "1.000" @@ -3687,7 +3687,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.map", 0, "2388efef8430b041b0f3b00b9050e4a2", 3281}, {"resource.000", 0, "b3acd9b9dd7fe53c4ee133ac9a1acfab", 2103560}, AD_LISTEND}, - Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NONE) }, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO0() }, // The Island of Dr. Brain - English DOS (from Quietust) // Executable scanning reports "1.001.053", VERSION file reports "1.1 2.3.93" diff --git a/engines/scumm/detection.cpp b/engines/scumm/detection.cpp index a1ad630815..2ae994040b 100644 --- a/engines/scumm/detection.cpp +++ b/engines/scumm/detection.cpp @@ -653,7 +653,7 @@ static void detectGames(const Common::FSList &fslist, Common::Listid == GID_MONKEY || g->id == GID_MONKEY2) // TODO: This may need to be updated if something important gets added in the top detection table for these game ids - dr.game.guioptions = GUIO1(GUIO_NONE); + dr.game.guioptions = GUIO0(); else warning("FIXME: fix NOSPEECH fallback"); } diff --git a/engines/scumm/detection_tables.h b/engines/scumm/detection_tables.h index 36a703f3bd..48a1a9d379 100644 --- a/engines/scumm/detection_tables.h +++ b/engines/scumm/detection_tables.h @@ -237,14 +237,14 @@ static const GameSettings gameVariantsTable[] = { {"monkey2", "", 0, GID_MONKEY2, 5, 0, MDT_PCSPK | MDT_ADLIB | MDT_MIDI | MDT_PREFER_MT32, 0, UNK, GUIO1(GUIO_NOSPEECH)}, {"monkey2", "FM-TOWNS", 0, GID_MONKEY2, 5, 0, MDT_PCSPK | MDT_TOWNS | MDT_ADLIB | MDT_MIDI | MDT_PREFER_MT32, 0, Common::kPlatformFMTowns, GUIO5(GUIO_NOSPEECH, GUIO_MIDITOWNS, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_NOASPECT)}, - {"atlantis", "", 0, GID_INDY4, 5, 0, MDT_PCSPK | MDT_ADLIB | MDT_MIDI | MDT_PREFER_MT32, 0, UNK, GUIO1(GUIO_NONE)}, + {"atlantis", "", 0, GID_INDY4, 5, 0, MDT_PCSPK | MDT_ADLIB | MDT_MIDI | MDT_PREFER_MT32, 0, UNK, GUIO0()}, {"atlantis", "Floppy", 0, GID_INDY4, 5, 0, MDT_PCSPK | MDT_ADLIB | MDT_MIDI | MDT_PREFER_MT32, 0, UNK, GUIO1(GUIO_NOSPEECH)}, {"atlantis", "FM-TOWNS", 0, GID_INDY4, 5, 0, MDT_TOWNS | MDT_ADLIB | MDT_MIDI | MDT_PREFER_MT32, 0, Common::kPlatformFMTowns, GUIO4(GUIO_MIDITOWNS, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_NOASPECT)}, - {"tentacle", "", 0, GID_TENTACLE, 6, 0, MDT_ADLIB | MDT_MIDI | MDT_PREFER_GM, GF_USE_KEY, UNK, GUIO1(GUIO_NONE)}, + {"tentacle", "", 0, GID_TENTACLE, 6, 0, MDT_ADLIB | MDT_MIDI | MDT_PREFER_GM, GF_USE_KEY, UNK, GUIO0()}, {"tentacle", "Floppy", 0, GID_TENTACLE, 6, 0, MDT_ADLIB | MDT_MIDI | MDT_PREFER_GM, GF_USE_KEY, UNK, GUIO1(GUIO_NOSPEECH)}, - {"samnmax", "", 0, GID_SAMNMAX, 6, 0, MDT_ADLIB | MDT_MIDI | MDT_PREFER_GM, GF_USE_KEY, UNK, GUIO1(GUIO_NONE)}, + {"samnmax", "", 0, GID_SAMNMAX, 6, 0, MDT_ADLIB | MDT_MIDI | MDT_PREFER_GM, GF_USE_KEY, UNK, GUIO0()}, {"samnmax", "Floppy", 0, GID_SAMNMAX, 6, 0, MDT_ADLIB | MDT_MIDI | MDT_PREFER_GM, GF_USE_KEY, UNK, GUIO1(GUIO_NOSPEECH)}, #ifdef ENABLE_SCUMM_7_8 diff --git a/engines/sky/detection.cpp b/engines/sky/detection.cpp index 2699500527..484958ca52 100644 --- a/engines/sky/detection.cpp +++ b/engines/sky/detection.cpp @@ -55,9 +55,9 @@ static const SkyVersion skyVersions[] = { { 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) }, + { 1711, -1, "cd demo", 365, GUIO0() }, + { 5099, -1, "cd", 368, GUIO0() }, + { 5097, -1, "cd", 372, GUIO0() }, { 0, 0, 0, 0, 0 } }; diff --git a/engines/teenagent/detection.cpp b/engines/teenagent/detection.cpp index cf58df1344..dad876dd97 100644 --- a/engines/teenagent/detection.cpp +++ b/engines/teenagent/detection.cpp @@ -74,7 +74,7 @@ static const ADGameDescription teenAgentGameDescriptions[] = { Common::CZ_CZE, Common::kPlatformPC, ADGF_CD, - GUIO1(GUIO_NONE) + GUIO0() }, AD_TABLE_END_MARKER, }; diff --git a/engines/testbed/detection.cpp b/engines/testbed/detection.cpp index 356d75f7ea..02a9dfcb87 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, - GUIO1(GUIO_NONE) + GUIO0() }, AD_TABLE_END_MARKER }; diff --git a/engines/tinsel/detection_tables.h b/engines/tinsel/detection_tables.h index 9175f9fa17..be44b1c462 100644 --- a/engines/tinsel/detection_tables.h +++ b/engines/tinsel/detection_tables.h @@ -62,7 +62,7 @@ static const TinselGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, - GUIO1(GUIO_NONE) + GUIO0() }, GID_DW1, 0, @@ -82,7 +82,7 @@ static const TinselGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformMacintosh, ADGF_DEMO, - GUIO1(GUIO_NONE) + GUIO0() }, GID_DW1, 0, @@ -210,7 +210,7 @@ static const TinselGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_CD, - GUIO1(GUIO_NONE) + GUIO0() }, GID_DW1, 0, @@ -232,7 +232,7 @@ static const TinselGameDescription gameDescriptions[] = { Common::IT_ITA, Common::kPlatformPC, ADGF_DROPLANGUAGE | ADGF_CD, - GUIO1(GUIO_NONE) + GUIO0() }, GID_DW1, 0, @@ -257,7 +257,7 @@ static const TinselGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformPC, ADGF_DROPLANGUAGE | ADGF_CD, - GUIO1(GUIO_NONE) + GUIO0() }, GID_DW1, 0, @@ -281,7 +281,7 @@ static const TinselGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_DROPLANGUAGE | ADGF_CD, - GUIO1(GUIO_NONE) + GUIO0() }, GID_DW1, 0, @@ -304,7 +304,7 @@ static const TinselGameDescription gameDescriptions[] = { Common::IT_ITA, Common::kPlatformPC, ADGF_DROPLANGUAGE | ADGF_CD, - GUIO1(GUIO_NONE) + GUIO0() }, GID_DW1, 0, @@ -327,7 +327,7 @@ static const TinselGameDescription gameDescriptions[] = { Common::ES_ESP, Common::kPlatformPC, ADGF_DROPLANGUAGE | ADGF_CD, - GUIO1(GUIO_NONE) + GUIO0() }, GID_DW1, 0, @@ -347,7 +347,7 @@ static const TinselGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_CD, - GUIO1(GUIO_NONE) + GUIO0() }, GID_DW1, 0, @@ -367,7 +367,7 @@ static const TinselGameDescription gameDescriptions[] = { Common::HE_ISR, Common::kPlatformPC, ADGF_CD, - GUIO1(GUIO_NONE) + GUIO0() }, GID_DW1, 0, @@ -386,7 +386,7 @@ static const TinselGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPSX, ADGF_CD, - GUIO1(GUIO_NONE) + GUIO0() }, GID_DW1, 0, @@ -409,7 +409,7 @@ static const TinselGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPSX, ADGF_DEMO, - GUIO1(GUIO_NONE) + GUIO0() }, GID_DW1, 0, @@ -430,7 +430,7 @@ static const TinselGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_CD, - GUIO1(GUIO_NONE) + GUIO0() }, GID_DW1, 0, @@ -452,7 +452,7 @@ static const TinselGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformMacintosh, ADGF_CD, - GUIO1(GUIO_NONE) + GUIO0() }, GID_DW1, 0, @@ -471,7 +471,7 @@ static const TinselGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_CD, - GUIO1(GUIO_NONE) + GUIO0() }, GID_DW1, 0, diff --git a/engines/toon/detection.cpp b/engines/toon/detection.cpp index 2afcb589b7..6a76ade90a 100644 --- a/engines/toon/detection.cpp +++ b/engines/toon/detection.cpp @@ -44,7 +44,7 @@ static const ADGameDescription gameDescriptions[] = { {"study.svl", 0, "281efa3f33f6712c0f641a605f4d40fd", 2511090}, AD_LISTEND }, - Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, GUIO1(GUIO_NONE) + Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, GUIO0() }, { "toon", "", @@ -54,7 +54,7 @@ static const ADGameDescription gameDescriptions[] = { {"study.svl", 0, "df056b94ea83f1ed92a539cf636053ab", 2542668}, AD_LISTEND }, - Common::FR_FRA, Common::kPlatformPC, ADGF_NO_FLAGS, GUIO1(GUIO_NONE) + Common::FR_FRA, Common::kPlatformPC, ADGF_NO_FLAGS, GUIO0() }, { "toon", "", @@ -64,7 +64,7 @@ static const ADGameDescription gameDescriptions[] = { {"study.svl", 0, "72fe96a9e10967d3138e918295babc42", 2910283}, AD_LISTEND }, - Common::DE_DEU, Common::kPlatformPC, ADGF_NO_FLAGS, GUIO1(GUIO_NONE) + Common::DE_DEU, Common::kPlatformPC, ADGF_NO_FLAGS, GUIO0() }, { "toon", "", @@ -74,7 +74,7 @@ static const ADGameDescription gameDescriptions[] = { {"study.svl", 0, "b6b1ee2d9d94d53d305856039ab7bde7", 2634620}, AD_LISTEND }, - Common::ES_ESP, Common::kPlatformPC, ADGF_NO_FLAGS, GUIO1(GUIO_NONE) + Common::ES_ESP, Common::kPlatformPC, ADGF_NO_FLAGS, GUIO0() }, { "toon", "", @@ -84,7 +84,7 @@ static const ADGameDescription gameDescriptions[] = { {"generic.svl", 0, "5eb99850ada22f0b8cf6392262d4dd07", 9404599}, AD_LISTEND }, - Common::DE_DEU, Common::kPlatformPC, ADGF_DEMO, GUIO1(GUIO_NONE) + Common::DE_DEU, Common::kPlatformPC, ADGF_DEMO, GUIO0() }, { "toon", "", @@ -93,7 +93,7 @@ static const ADGameDescription gameDescriptions[] = { {"generic.svl", 0, "5c42724bb93b360dca7044d6b7ef26e5", 7739319}, AD_LISTEND }, - Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO1(GUIO_NONE) + Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO0() }, AD_TABLE_END_MARKER diff --git a/engines/touche/detection.cpp b/engines/touche/detection.cpp index a42d765056..35dd54776f 100644 --- a/engines/touche/detection.cpp +++ b/engines/touche/detection.cpp @@ -45,7 +45,7 @@ static const ADGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, { // retail version - tracker item #1601818 "touche", @@ -54,7 +54,7 @@ static const ADGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, { // retail version "touche", @@ -63,7 +63,7 @@ static const ADGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, { // retail version - tracker item #1598643 "touche", @@ -72,7 +72,7 @@ static const ADGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, { // retail version - tracker item #1681643 "touche", @@ -81,7 +81,7 @@ static const ADGameDescription gameDescriptions[] = { Common::ES_ESP, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, { // fan-made translation (http://www.iagtg.net/) - tracker item #1602360 "touche", @@ -90,7 +90,7 @@ static const ADGameDescription gameDescriptions[] = { Common::IT_ITA, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, { // retail version - tracker item #1800500 "touche", @@ -99,7 +99,7 @@ static const ADGameDescription gameDescriptions[] = { Common::PL_POL, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }, { // demo version "touche", @@ -108,7 +108,7 @@ static const ADGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, - GUIO1(GUIO_NONE) + GUIO0() }, AD_TABLE_END_MARKER }; diff --git a/engines/tucker/detection.cpp b/engines/tucker/detection.cpp index 77c84b281c..aeeebe6877 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, - GUIO1(GUIO_NONE) + GUIO0() }, { "tucker", @@ -52,7 +52,7 @@ static const ADGameDescription tuckerGameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, Tucker::kGameFlagEncodedData, - GUIO1(GUIO_NONE) + GUIO0() }, { "tucker", @@ -61,7 +61,7 @@ static const ADGameDescription tuckerGameDescriptions[] = { Common::ES_ESP, Common::kPlatformPC, Tucker::kGameFlagEncodedData, - GUIO1(GUIO_NONE) + GUIO0() }, { "tucker", @@ -70,7 +70,7 @@ static const ADGameDescription tuckerGameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, Tucker::kGameFlagEncodedData, - GUIO1(GUIO_NONE) + GUIO0() }, { "tucker", @@ -79,7 +79,7 @@ static const ADGameDescription tuckerGameDescriptions[] = { Common::PL_POL, Common::kPlatformPC, 0, - GUIO1(GUIO_NONE) + GUIO0() }, { "tucker", @@ -88,7 +88,7 @@ static const ADGameDescription tuckerGameDescriptions[] = { Common::CZ_CZE, Common::kPlatformPC, Tucker::kGameFlagEncodedData, - GUIO1(GUIO_NONE) + GUIO0() }, { "tucker", @@ -97,7 +97,7 @@ static const ADGameDescription tuckerGameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO | Tucker::kGameFlagDemo, - GUIO1(GUIO_NONE) + GUIO0() }, AD_TABLE_END_MARKER }; @@ -109,7 +109,7 @@ static const ADGameDescription tuckerDemoGameDescription = { Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO | Tucker::kGameFlagDemo | Tucker::kGameFlagIntroOnly, - GUIO1(GUIO_NONE) + GUIO0() }; class TuckerMetaEngine : public AdvancedMetaEngine { -- cgit v1.2.3