[Scummvm-cvs-logs] scummvm master -> fd84b0461468c5f1b7c0e4a33bc92c088ebda9c4

dreammaster dreammaster at scummvm.org
Tue Jun 21 11:46:05 CEST 2011


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
fd84b04614 TSAGE: Fixes for sound fading


Commit: fd84b0461468c5f1b7c0e4a33bc92c088ebda9c4
    https://github.com/scummvm/scummvm/commit/fd84b0461468c5f1b7c0e4a33bc92c088ebda9c4
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-06-21T02:44:22-07:00

Commit Message:
TSAGE: Fixes for sound fading

Changed paths:
    engines/tsage/sound.cpp



diff --git a/engines/tsage/sound.cpp b/engines/tsage/sound.cpp
index fec5518..811e272 100644
--- a/engines/tsage/sound.cpp
+++ b/engines/tsage/sound.cpp
@@ -1341,14 +1341,14 @@ void SoundManager::_sfDoUpdateVolume(Sound *sound) {
 			SoundDriver *driver = vse._driver;
 
 			if (vs->_voiceType == VOICETYPE_0) {
-				if (!vse._type0._sound) {
+				if (vse._type0._sound) {
 					int vol = sound->_volume * sound->_chVolume[vse._type0._channelNum] / 127;
 					driver->proc24(voiceIndex, vse._voiceNum, sound, 7, vol);
 				}
 			} else {
-				if (!vse._type1._sound) {
+				if (vse._type1._sound) {
 					int vol = sound->_volume * sound->_chVolume[vse._type1._channelNum] / 127;
-					driver->setVolume1(voiceIndex, vse._voiceNum, 7, vol);
+					driver->proc38(vse._voiceNum, 7, vol);
 				}
 			}
 		}






More information about the Scummvm-git-logs mailing list