diff options
| author | Strangerke | 2011-11-16 22:38:58 +0100 |
|---|---|---|
| committer | Strangerke | 2011-11-16 22:38:58 +0100 |
| commit | bab4b6f7295f6fb960ebbf44b009bd6adbd0d33e (patch) | |
| tree | 1a264224894bb9bfd141ff2ccc519a0f04266f52 /engines/scumm | |
| parent | d608c079447c64255e4e27d44a7dc843cf5f6407 (diff) | |
| download | scummvm-rg350-bab4b6f7295f6fb960ebbf44b009bd6adbd0d33e.tar.gz scummvm-rg350-bab4b6f7295f6fb960ebbf44b009bd6adbd0d33e.tar.bz2 scummvm-rg350-bab4b6f7295f6fb960ebbf44b009bd6adbd0d33e.zip | |
LAUNCHER: Introduce GUIO0() in order to replace GUIO1(GUIO_NONE)
Diffstat (limited to 'engines/scumm')
| -rw-r--r-- | engines/scumm/detection.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/detection_tables.h | 6 |
2 files changed, 4 insertions, 4 deletions
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::List<DetectorResul if (strchr(dr.game.guioptions, GUIO_NOSPEECH[0]) != NULL) { if (g->id == 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 |