[Scummvm-cvs-logs] SF.net SVN: scummvm:[47631] scummvm/trunk/engines/sci/sound/music.cpp

[thebluegr at users.sourceforge.net]

Revision: 47631
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47631&view=rev
Author:   thebluegr
Date:     2010-01-28 08:23:40 +0000 (Thu, 28 Jan 2010)

Log Message:
-----------
Always try and load the associated digital track if the requested MIDI track couldn't be found

Modified Paths:
--------------
    scummvm/trunk/engines/sci/sound/music.cpp

Modified: scummvm/trunk/engines/sci/sound/music.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/music.cpp	2010-01-28 08:17:46 UTC (rev 47630)
+++ scummvm/trunk/engines/sci/sound/music.cpp	2010-01-28 08:23:40 UTC (rev 47631)
@@ -172,7 +172,9 @@
 
 	// If MIDI device is selected but there is no digital track in sound resource
 	// try to use adlib's digital sample if possible
-	if (_bMultiMidi && (!track || track->digitalChannelNr == -1)) {
+	// Also, if the track couldn't be found, load the digital track, as some games
+	// depend on this (e.g. the Longbow demo)
+	if (!track || (_bMultiMidi && track->digitalChannelNr == -1)) {
 		SoundResource::Track *digital = pSnd->soundRes->getDigitalTrack();
 		if (digital)
 			track = digital;


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