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

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Thu Nov 25 23:14:38 CET 2010


Revision: 54481
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54481&view=rev
Author:   thebluegr
Date:     2010-11-25 22:14:38 +0000 (Thu, 25 Nov 2010)

Log Message:
-----------
SCI: Initialize global reverb correctly. Fixes bug #3118700 - "SCI KQ5: Assertion in midi.cpp" (regression from r54478)

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-11-25 18:42:05 UTC (rev 54480)
+++ scummvm/trunk/engines/sci/sound/music.cpp	2010-11-25 22:14:38 UTC (rev 54481)
@@ -39,7 +39,7 @@
 namespace Sci {
 
 SciMusic::SciMusic(SciVersion soundVersion)
-	: _soundVersion(soundVersion), _soundOn(true), _masterVolume(0), _globalReverb(-1) {
+	: _soundVersion(soundVersion), _soundOn(true), _masterVolume(0), _globalReverb(0) {
 
 	// Reserve some space in the playlist, to avoid expensive insertion
 	// operations
@@ -116,6 +116,8 @@
 	// remapping).
 	_driverFirstChannel = _pMidiDrv->getFirstChannel();
 	_driverLastChannel = _pMidiDrv->getLastChannel();
+	if (getSciVersion() <= SCI_VERSION_0_LATE)
+		_globalReverb = _pMidiDrv->getReverb();	// Init global reverb for SCI0
 }
 
 void SciMusic::miditimerCallback(void *p) {


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




More information about the Scummvm-git-logs mailing list