[Scummvm-cvs-logs] SF.net SVN: scummvm:[51987] scummvm/trunk/engines/scumm/scumm.cpp

[eriktorbjorn at users.sourceforge.net]

Revision: 51987
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51987&view=rev
Author:   eriktorbjorn
Date:     2010-08-11 15:16:55 +0000 (Wed, 11 Aug 2010)

Log Message:
-----------
SCUMM: Add missing case in sound initialisation

If the mixer isn't ready, we probably have to check for PCjr as well,
so add that case.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/scumm.cpp

Modified: scummvm/trunk/engines/scumm/scumm.cpp
===================================================================
--- scummvm/trunk/engines/scumm/scumm.cpp	2010-08-11 15:09:07 UTC (rev 51986)
+++ scummvm/trunk/engines/scumm/scumm.cpp	2010-08-11 15:16:55 UTC (rev 51987)
@@ -1711,7 +1711,7 @@
 	 * automatically when samples need to be generated */
 	if (!_mixer->isReady()) {
 		warning("Sound mixer initialization failed");
-		if (_musicType == MDT_ADLIB || _musicType == MDT_PCSPK || _musicType == MDT_CMS)	{
+		if (_musicType == MDT_ADLIB || _musicType == MDT_PCSPK || _musicType == MDT_PCJR || _musicType == MDT_CMS) {
 			dev = 0;
 			_musicType = MDT_NONE;
 			warning("MIDI driver depends on sound mixer, switching to null MIDI driver");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.