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

[DONOTREPLY at icculus.org]

Author: thilo
Date: 2009-10-08 18:26:10 -0400 (Thu, 08 Oct 2009)
New Revision: 1650

Modified:
   trunk/code/client/snd_dma.c
Log:
Make s_volume cvar affect volume of S_Base_RawSamples, thanks to Jay Weisskopf for reporting. https://bugzilla.icculus.org/show_bug.cgi?id=3474


Modified: trunk/code/client/snd_dma.c
===================================================================
--- trunk/code/client/snd_dma.c	2009-10-08 20:03:25 UTC (rev 1649)
+++ trunk/code/client/snd_dma.c	2009-10-08 22:26:10 UTC (rev 1650)
@@ -916,7 +916,7 @@
 
 /*
 ============
-S_RawSamples
+S_Base_RawSamples
 
 Music streaming
 ============
@@ -937,10 +937,10 @@
 	}
 	rawsamples = s_rawsamples[stream];
 
-	intVolume = 256 * volume;
+	intVolume = 256 * volume * s_volume->value;
 
 	if ( s_rawend[stream] < s_soundtime ) {
-		Com_DPrintf( "S_RawSamples: resetting minimum: %i < %i\n", s_rawend[stream], s_soundtime );
+		Com_DPrintf( "S_Base_RawSamples: resetting minimum: %i < %i\n", s_rawend[stream], s_soundtime );
 		s_rawend[stream] = s_soundtime;
 	}
 
@@ -1018,7 +1018,7 @@
 	}
 
 	if ( s_rawend[stream] > s_soundtime + MAX_RAW_SAMPLES ) {
-		Com_DPrintf( "S_RawSamples: overflowed %i > %i\n", s_rawend[stream], s_soundtime );
+		Com_DPrintf( "S_Base_RawSamples: overflowed %i > %i\n", s_rawend[stream], s_soundtime );
 	}
 }