[Scummvm-cvs-logs] SF.net SVN: scummvm:[46829] scummvm/trunk/engines/sci/sfx

[m_kiewitz at users.sourceforge.net]

Revision: 46829
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46829&view=rev
Author:   m_kiewitz
Date:     2010-01-01 14:33:20 +0000 (Fri, 01 Jan 2010)

Log Message:
-----------
SCI/newmusic: better solution for volume - using int16 during fade, volume is now byte again

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

Modified: scummvm/trunk/engines/sci/sfx/music.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/music.cpp	2010-01-01 14:23:16 UTC (rev 46828)
+++ scummvm/trunk/engines/sci/sfx/music.cpp	2010-01-01 14:33:20 UTC (rev 46829)
@@ -559,13 +559,15 @@
 	if (fadeTicker)
 		fadeTicker--;
 	else {
+		int16 fadeVolume = volume;
 		fadeTicker = fadeTickerStep;
-		volume += fadeStep;
-		if (((fadeStep > 0) && (volume >= fadeTo)) || ((fadeStep < 0) && (volume <= fadeTo))) {
-			volume = fadeTo;
+		fadeVolume += fadeStep;
+		if (((fadeStep > 0) && (fadeVolume >= fadeTo)) || ((fadeStep < 0) && (fadeVolume <= fadeTo))) {
+			fadeVolume = fadeTo;
 			fadeStep = 0;
 			signal = SIGNAL_OFFSET;
 		}
+		volume = fadeVolume;
 
 		if (pMidiParser)
 			pMidiParser->setVolume(volume);

Modified: scummvm/trunk/engines/sci/sfx/music.h
===================================================================
--- scummvm/trunk/engines/sci/sfx/music.h	2010-01-01 14:23:16 UTC (rev 46828)
+++ scummvm/trunk/engines/sci/sfx/music.h	2010-01-01 14:33:20 UTC (rev 46829)
@@ -80,7 +80,7 @@
 	uint16 signal;
 	byte prio;
 	uint16 loop;
-	int16 volume;
+	byte volume;
 	byte hold;
 
 	int16 pauseCounter;


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