From c01c63c3a6137b1dfcad83b2e87febdffd22e1d2 Mon Sep 17 00:00:00 2001 From: thilo Date: Thu, 8 Oct 2009 22:26:10 +0000 Subject: 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 git-svn-id: svn://svn.icculus.org/quake3/trunk@1650 edf5b092-35ff-0310-97b2-ce42778d08ea --- code/client/snd_dma.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/client/snd_dma.c b/code/client/snd_dma.c index cb8bfb9..adbd21b 100644 --- a/code/client/snd_dma.c +++ b/code/client/snd_dma.c @@ -916,7 +916,7 @@ void S_ByteSwapRawSamples( int samples, int width, int s_channels, const byte *d /* ============ -S_RawSamples +S_Base_RawSamples Music streaming ============ @@ -937,10 +937,10 @@ void S_Base_RawSamples( int stream, int samples, int rate, int width, int s_chan } 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 @@ void S_Base_RawSamples( int stream, int samples, int rate, int width, int s_chan } 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 ); } } -- cgit v1.2.3