aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoricculus <icculus@edf5b092-35ff-0310-97b2-ce42778d08ea>2009-09-15 00:53:02 +0000
committericculus <icculus@edf5b092-35ff-0310-97b2-ce42778d08ea>2009-09-15 00:53:02 +0000
commiteeede6e3648b16f150ff5fe03cf610dff892cfe4 (patch)
tree0a32470b904ad7cf10f6009516d874ab9b10d067
parenta3f687b44d22868f91d96bd7c2b9638a2c68277f (diff)
downloadioquake3-aero-eeede6e3648b16f150ff5fe03cf610dff892cfe4.tar.gz
ioquake3-aero-eeede6e3648b16f150ff5fe03cf610dff892cfe4.zip
Removed broken music fading code from snd_dma.
Fixes Bugzilla #3757. git-svn-id: svn://svn.icculus.org/quake3/trunk@1603 edf5b092-35ff-0310-97b2-ce42778d08ea
-rw-r--r--code/client/snd_dma.c8
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
{