Skip to content

Commit

Permalink
Make s_volume cvar affect volume of S_Base_RawSamples, thanks to Jay …
Browse files Browse the repository at this point in the history
  • Loading branch information
Thilo Schulz committed Oct 8, 2009
1 parent 9b7543a commit ff2f143
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions code/client/snd_dma.c
Expand Up @@ -916,7 +916,7 @@ void S_ByteSwapRawSamples( int samples, int width, int s_channels, const byte *d

/*
============
S_RawSamples
S_Base_RawSamples
Music streaming
============
Expand All @@ -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;
}

Expand Down Expand Up @@ -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 );
}
}

Expand Down

0 comments on commit ff2f143

Please sign in to comment.