[Scummvm-cvs-logs] scummvm master -> 60c2061710838c494fddb3e73f16b583a555b448

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
60c2061710 SCI: Allow the Fun Seeker's Guide demo to run


Commit: 60c2061710838c494fddb3e73f16b583a555b448
    https://github.com/scummvm/scummvm/commit/60c2061710838c494fddb3e73f16b583a555b448
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2012-09-01T07:59:52-07:00

Commit Message:
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

Changed paths:
    engines/sci/sound/music.cpp



diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp
index 918b045..ffd51da 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