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

[thebluegr at users.sourceforge.net]

Revision: 47566
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47566&view=rev
Author:   thebluegr
Date:     2010-01-26 13:06:21 +0000 (Tue, 26 Jan 2010)

Log Message:
-----------
Removed the unnecessary fadeVolume variable

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-01-26 11:40:54 UTC (rev 47565)
+++ scummvm/trunk/engines/sci/sound/music.cpp	2010-01-26 13:06:21 UTC (rev 47566)
@@ -474,15 +474,13 @@
 	if (fadeTicker)
 		fadeTicker--;
 	else {
-		int16 fadeVolume = volume;
 		fadeTicker = fadeTickerStep;
-		fadeVolume += fadeStep;
-		if (((fadeStep > 0) && (fadeVolume >= fadeTo)) || ((fadeStep < 0) && (fadeVolume <= fadeTo))) {
-			fadeVolume = fadeTo;
+		volume += fadeStep;
+		if (((fadeStep > 0) && (volume >= fadeTo)) || ((fadeStep < 0) && (volume <= fadeTo))) {
+			volume = fadeTo;
 			fadeStep = 0;
 			fadeCompleted = true;
 		}
-		volume = fadeVolume;
 
 		// Only process MIDI streams in this thread, not digital sound effects
 		if (pMidiParser)


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