diff options
| author | Matthew Hoops | 2012-09-05 11:45:25 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2012-09-05 11:45:25 -0400 |
| commit | f35e820e9f2f4c2f8b9c6d3b572d588fccf99f19 (patch) | |
| tree | 42510da50bdf8515a577fdd74622539ff829ef78 /engines/sci/sound/music.cpp | |
| parent | 2f9b1b67b08f1b70cd95795aaf7816ca7f991649 (diff) | |
| parent | 058b9b9aca066c886ceb4e454a5541be70c27cb6 (diff) | |
| download | scummvm-rg350-f35e820e9f2f4c2f8b9c6d3b572d588fccf99f19.tar.gz scummvm-rg350-f35e820e9f2f4c2f8b9c6d3b572d588fccf99f19.tar.bz2 scummvm-rg350-f35e820e9f2f4c2f8b9c6d3b572d588fccf99f19.zip | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'engines/sci/sound/music.cpp')
| -rw-r--r-- | engines/sci/sound/music.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp index 918b045cb9..a8a65d2aa4 100644 --- a/engines/sci/sound/music.cpp +++ b/engines/sci/sound/music.cpp @@ -125,7 +125,13 @@ void SciMusic::init() { _pMidiDrv->setTimerCallback(this, &miditimerCallback); _dwTempo = _pMidiDrv->getBaseTempo(); } else { - error("Failed to initialize sound driver"); + if (g_sci->getGameId() == GID_FUNSEEKER) { + // HACK: The Fun Seeker's Guide demo doesn't have patch 3 and the version + // of the Adlib driver (adl.drv) that it includes is unsupported. That demo + // doesn't have any sound anyway, so this shouldn't be fatal. + } else { + error("Failed to initialize sound driver"); + } } // Find out what the first possible channel is (used, when doing channel |