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

[m_kiewitz at users.sourceforge.net]

Revision: 50057
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50057&view=rev
Author:   m_kiewitz
Date:     2010-06-19 19:16:42 +0000 (Sat, 19 Jun 2010)

Log Message:
-----------
SCI: fixing uninitialized usage in MidiParser_SCI

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

Modified: scummvm/trunk/engines/sci/sound/midiparser_sci.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/midiparser_sci.cpp	2010-06-19 19:06:58 UTC (rev 50056)
+++ scummvm/trunk/engines/sci/sound/midiparser_sci.cpp	2010-06-19 19:16:42 UTC (rev 50057)
@@ -73,9 +73,6 @@
 	_pSnd = psnd;
 	_soundVersion = soundVersion;
 
-	if (_pSnd)
-		setVolume(psnd->volume);
-
 	for (int i = 0; i < 15; i++) {
 		_channelUsed[i] = false;
 		_channelRemap[i] = -1;
@@ -84,6 +81,9 @@
 	_channelRemap[9] = 9; // never map channel 9, because that's used for percussion
 	_channelRemap[15] = 15; // never map channel 15, because thats used by sierra internally
 
+	if (_pSnd)
+		setVolume(psnd->volume);
+
 	if (channelFilterMask) {
 		// SCI0 only has 1 data stream, but we need to filter out channels depending on music hardware selection
 		midiFilterChannels(channelFilterMask);


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