diff options
| author | Filippos Karapetis | 2012-04-29 20:43:04 +0300 |
|---|---|---|
| committer | Filippos Karapetis | 2012-04-29 20:45:16 +0300 |
| commit | e41e412c9ee6c277233ef9f7a5304f8cc40fa370 (patch) | |
| tree | 3e770122684770ef243f087f9e0e7869451787e6 /engines/sci/sound | |
| parent | 24e57808aa946ad38379b43ca205af6ef151c66a (diff) | |
| download | scummvm-rg350-e41e412c9ee6c277233ef9f7a5304f8cc40fa370.tar.gz scummvm-rg350-e41e412c9ee6c277233ef9f7a5304f8cc40fa370.tar.bz2 scummvm-rg350-e41e412c9ee6c277233ef9f7a5304f8cc40fa370.zip | |
SCI: Fix for bug #3522046 "Detection of SQ4CD as Windows breaks Music"
Fall back to the DOS soundtracks in Windows CD versions if the user picks
a non-General MIDI music device, as the Windows tracks only contain MIDI
music
Diffstat (limited to 'engines/sci/sound')
| -rw-r--r-- | engines/sci/sound/music.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp index 09cab75c39..918b045cb9 100644 --- a/engines/sci/sound/music.cpp +++ b/engines/sci/sound/music.cpp @@ -88,6 +88,12 @@ void SciMusic::init() { uint32 dev = MidiDriver::detectDevice(deviceFlags); _musicType = MidiDriver::getMusicType(dev); + if (g_sci->_features->useAltWinGMSound() && _musicType != MT_GM) { + warning("A Windows CD version with an alternate MIDI soundtrack has been chosen, " + "but no MIDI music device has been selected. Reverting to the DOS soundtrack"); + g_sci->_features->forceDOSTracks(); + } + switch (_musicType) { case MT_ADLIB: // FIXME: There's no Amiga sound option, so we hook it up to AdLib |