diff options
| author | Filippos Karapetis | 2012-09-01 17:59:52 +0300 |
|---|---|---|
| committer | Filippos Karapetis | 2012-09-01 17:59:52 +0300 |
| commit | 60c2061710838c494fddb3e73f16b583a555b448 (patch) | |
| tree | 53173df53cdeaf2abb627153541f2b9f37f91170 | |
| parent | 09f193352ae519e69bf704620a7351830e3495d6 (diff) | |
| download | scummvm-rg350-60c2061710838c494fddb3e73f16b583a555b448.tar.gz scummvm-rg350-60c2061710838c494fddb3e73f16b583a555b448.tar.bz2 scummvm-rg350-60c2061710838c494fddb3e73f16b583a555b448.zip | |
SCI: Allow the Fun Seeker's Guide demo to run
This demo doesn't have any music, and the original doesn't work with any sound
driver, so don't error out when the sound driver can't be initialized properly
| -rw-r--r-- | engines/sci/sound/music.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp index 918b045cb9..ffd51da673 100644 --- a/engines/sci/sound/music.cpp +++ b/engines/sci/sound/music.cpp @@ -125,7 +125,10 @@ void SciMusic::init() { _pMidiDrv->setTimerCallback(this, &miditimerCallback); _dwTempo = _pMidiDrv->getBaseTempo(); } else { - error("Failed to initialize sound driver"); + // Happens in the Fun Seeker's Guide demo, which doesn't have any sound + // anyway (nor works if anything other than PC Spearker is set), so this + // shouldn't be fatal + warning("Failed to initialize sound driver"); } // Find out what the first possible channel is (used, when doing channel |