[quake3-commits] r1603 - trunk/code/client

[DONOTREPLY at icculus.org]

Author: icculus
Date: 2009-09-14 20:53:02 -0400 (Mon, 14 Sep 2009)
New Revision: 1603

Modified:
   trunk/code/client/snd_dma.c
Log:
Removed broken music fading code from snd_dma.

 Fixes Bugzilla #3757.


Modified: trunk/code/client/snd_dma.c
===================================================================
--- trunk/code/client/snd_dma.c	2009-09-15 00:19:22 UTC (rev 1602)
+++ trunk/code/client/snd_dma.c	2009-09-15 00:53:02 UTC (rev 1603)
@@ -1353,17 +1353,13 @@
 	byte	raw[30000];		// just enough to fit in a mac stack frame
 	int		fileBytes;
 	int		r;
-	static	float	musicVolume = 0.5f;
 
 	if(!s_backgroundStream) {
 		return;
 	}
 
-	// graeme see if this is OK
-	musicVolume = (musicVolume + (s_musicVolume->value * 2))/4.0f;
-
 	// don't bother playing anything if musicvolume is 0
-	if ( musicVolume <= 0 ) {
+	if ( s_musicVolume->value <= 0 ) {
 		return;
 	}
 
@@ -1397,7 +1393,7 @@
 		{
 			// add to raw buffer
 			S_Base_RawSamples( 0, fileSamples, s_backgroundStream->info.rate,
-				s_backgroundStream->info.width, s_backgroundStream->info.channels, raw, musicVolume );
+				s_backgroundStream->info.width, s_backgroundStream->info.channels, raw, s_musicVolume->value );
 		}
 		else
 		{