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

[m_kiewitz at users.sourceforge.net]

Revision: 49285
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49285&view=rev
Author:   m_kiewitz
Date:     2010-05-28 09:29:05 +0000 (Fri, 28 May 2010)

Log Message:
-----------
SCI: read out vol selector on initSound/playSound for sci1early (soundversion) as well - fixes lsl1demo

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

Modified: scummvm/trunk/engines/sci/sound/soundcmd.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/soundcmd.cpp	2010-05-28 05:03:32 UTC (rev 49284)
+++ scummvm/trunk/engines/sci/sound/soundcmd.cpp	2010-05-28 09:29:05 UTC (rev 49285)
@@ -304,7 +304,7 @@
 	newSound->soundObj = obj;
 	newSound->loop = GET_SEL32V(_segMan, obj, SELECTOR(loop));
 	newSound->priority = GET_SEL32V(_segMan, obj, SELECTOR(pri)) & 0xFF;
-	if (_soundVersion >= SCI_VERSION_1_LATE)
+	if (_soundVersion >= SCI_VERSION_1_EARLY)
 		newSound->volume = CLIP<int>(GET_SEL32V(_segMan, obj, SELECTOR(vol)), 0, MUSIC_VOLUME_MAX);
 
 	// In SCI1.1 games, sound effects are started from here. If we can find
@@ -440,7 +440,7 @@
 
 	musicSlot->loop = GET_SEL32V(_segMan, obj, SELECTOR(loop));
 	musicSlot->priority = GET_SEL32V(_segMan, obj, SELECTOR(priority));
-	if (_soundVersion >= SCI_VERSION_1_LATE)
+	if (_soundVersion >= SCI_VERSION_1_EARLY)
 		musicSlot->volume = GET_SEL32V(_segMan, obj, SELECTOR(vol));
 	_music->soundPlay(musicSlot);
 


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