diff options
Diffstat (limited to 'code/client/snd_dma.c')
| -rw-r--r-- | code/client/snd_dma.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/code/client/snd_dma.c b/code/client/snd_dma.c index acda0f5..a8ce121 100644 --- a/code/client/snd_dma.c +++ b/code/client/snd_dma.c @@ -1353,17 +1353,13 @@ void S_UpdateBackgroundTrack( void ) { 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 @@ void S_UpdateBackgroundTrack( void ) { { // 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 { |