diff options
| author | Matthew Hoops | 2011-12-12 15:25:28 -0500 |
|---|---|---|
| committer | Matthew Hoops | 2011-12-12 15:25:28 -0500 |
| commit | 00279659b22cbd5db739d5351e83a9fc2a2ae408 (patch) | |
| tree | 497f06f46820043cbdf1725652b8f0073223e24a /engines/tsage/detection_tables.h | |
| parent | d932df79bed5aac97e17c0920a5e75cb5ce733ee (diff) | |
| parent | d1628feb761acc9f4607f64de3eb620fea53bcc9 (diff) | |
| download | scummvm-rg350-00279659b22cbd5db739d5351e83a9fc2a2ae408.tar.gz scummvm-rg350-00279659b22cbd5db739d5351e83a9fc2a2ae408.tar.bz2 scummvm-rg350-00279659b22cbd5db739d5351e83a9fc2a2ae408.zip | |
Merge remote branch 'upstream/master' into pegasus
Conflicts:
video/qt_decoder.cpp
Diffstat (limited to 'engines/tsage/detection_tables.h')
| -rw-r--r-- | engines/tsage/detection_tables.h | 38 |
1 files changed, 27 insertions, 11 deletions
diff --git a/engines/tsage/detection_tables.h b/engines/tsage/detection_tables.h index 4b69549673..d6b1760b80 100644 --- a/engines/tsage/detection_tables.h +++ b/engines/tsage/detection_tables.h @@ -32,8 +32,8 @@ static const tSageGameDescription gameDescriptions[] = { AD_ENTRY1s("ring.rlb", "466f0e6492d9d0f34d35c5cd088de90f", 37847618), Common::EN_ANY, Common::kPlatformPC, - ADGF_TESTING | ADGF_CD, - Common::GUIO_NOSPEECH | Common::GUIO_NOSFX + ADGF_CD, + GUIO2(GUIO_NOSPEECH, GUIO_NOSFX) }, GType_Ringworld, GF_CD | GF_ALT_REGIONS @@ -46,8 +46,8 @@ static const tSageGameDescription gameDescriptions[] = { AD_ENTRY1s("ring.rlb", "cb8bba91b30cd172712371d7123bd763", 7427980), Common::ES_ESP, Common::kPlatformPC, - ADGF_TESTING | ADGF_CD, - Common::GUIO_NOSPEECH | Common::GUIO_NOSFX + ADGF_CD, + GUIO2(GUIO_NOSPEECH, GUIO_NOSFX) }, GType_Ringworld, GF_CD | GF_ALT_REGIONS @@ -60,8 +60,8 @@ static const tSageGameDescription gameDescriptions[] = { AD_ENTRY1s("ring.rlb", "7b7f0c5b37b58fa5ec06ebb2ca0d0d9d", 8438770), Common::EN_ANY, Common::kPlatformPC, - ADGF_TESTING, - Common::GUIO_NOSPEECH | Common::GUIO_NOSFX + ADGF_NO_FLAGS, + 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,11 +135,27 @@ 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 }, + + // Return to Ringworld + { + { + "ringworld2", + "CD", + AD_ENTRY1s("r2rw.rlb", "df6c25622387007788ca36d99362c1f0", 47586928), + Common::EN_ANY, + Common::kPlatformPC, + ADGF_CD | ADGF_UNSTABLE, + GUIO0() + }, + GType_Ringworld2, + GF_CD | GF_ALT_REGIONS + }, + { AD_TABLE_END_MARKER, 0, 0 } }; |