diff options
| author | Jamieson Christian | 2003-09-16 11:44:48 +0000 |
|---|---|---|
| committer | Jamieson Christian | 2003-09-16 11:44:48 +0000 |
| commit | 091b41a2787cf7eeb36732cb02aec68c66ab570c (patch) | |
| tree | fa0ae6d9588b41eb2e770b69a12d2741d60f8dee /scumm/scummvm.cpp | |
| parent | 00c1fdce3aa67fae7d314ba48dfbb774879cf221 (diff) | |
| download | scummvm-rg350-091b41a2787cf7eeb36732cb02aec68c66ab570c.tar.gz scummvm-rg350-091b41a2787cf7eeb36732cb02aec68c66ab570c.tar.bz2 scummvm-rg350-091b41a2787cf7eeb36732cb02aec68c66ab570c.zip | |
Partial fix for Bug [636985] ZAK256: No kazoo tune
Implemented a parser for Euphony music. No
FM instrument support yet, as the FM chip used
by FM Towns is not being emulated yet. In the
meantime, a stock FM-emulated GM instrument is
being used instead.
This at least makes the Zak Towns kazoo tune
and the Loom Towns distaff audible. Emulation
of the FM Towns synth chip, or suitable
emulation using the OPL2 synth, is still
under investigation.
svn-id: r10265
Diffstat (limited to 'scumm/scummvm.cpp')
| -rw-r--r-- | scumm/scummvm.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index 9751856a70..408e3f9dae 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -91,11 +91,11 @@ static const TargetSettings scumm_settings[] = { GF_SMALL_HEADER | GF_SMALL_NAMES | GF_NO_SCALING | GF_OLD256 | GF_FEW_LOCALS | GF_FMTOWNS | GF_AUDIOTRACKS, "00.LFL"}, {"indy3", "Indiana Jones and the Last Crusade (256)", GID_INDY3, 3, MDT_PCSPK | MDT_ADLIB, GF_SMALL_HEADER | GF_SMALL_NAMES | GF_NO_SCALING | GF_OLD256 | GF_FEW_LOCALS, "00.LFL"}, - {"zak256", "Zak McKracken and the Alien Mindbenders (256)", GID_ZAK256, 3, MDT_PCSPK, + {"zak256", "Zak McKracken and the Alien Mindbenders (256)", GID_ZAK256, 3, MDT_ADLIB, GF_SMALL_HEADER | GF_SMALL_NAMES | GF_NO_SCALING | GF_OLD256 | GF_FMTOWNS | GF_AUDIOTRACKS, "00.LFL"}, {"loom", "Loom", GID_LOOM, 3, MDT_PCSPK | MDT_ADLIB | MDT_NATIVE, GF_SMALL_HEADER | GF_SMALL_NAMES | GF_NO_SCALING | GF_USE_KEY | GF_16COLOR | GF_OLD_BUNDLE, "00.LFL"}, - {"loomTowns", "Loom (FM Towns)", GID_LOOM, 3, MDT_NONE, + {"loomTowns", "Loom (FM Towns)", GID_LOOM, 3, MDT_ADLIB, GF_SMALL_HEADER | GF_SMALL_NAMES | GF_NO_SCALING | GF_OLD256 | GF_FMTOWNS | GF_AUDIOTRACKS, "00.LFL"}, /* Scumm Version 4 */ @@ -723,7 +723,7 @@ Scumm::Scumm (GameDetector *detector, OSystem *syst) _imuse->property(IMuse::PROP_OLD_ADLIB_INSTRUMENTS, (_features & GF_SMALL_HEADER) ? 1 : 0); _imuse->property(IMuse::PROP_MULTI_MIDI, detector->_multi_midi && _midiDriver != MD_NULL); _imuse->property(IMuse::PROP_NATIVE_MT32, detector->_native_mt32); - if (_features & GF_HUMONGOUS) { + if (_features & GF_HUMONGOUS || _features & GF_FMTOWNS) { _imuse->property(IMuse::PROP_LIMIT_PLAYERS, 1); _imuse->property(IMuse::PROP_RECYCLE_PLAYERS, 1); } |