summaryrefslogtreecommitdiff
path: root/src/client/snd_dma.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/client/snd_dma.c')
-rw-r--r--src/client/snd_dma.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/client/snd_dma.c b/src/client/snd_dma.c
index 472af0d8..ad6193c8 100644
--- a/src/client/snd_dma.c
+++ b/src/client/snd_dma.c
@@ -34,10 +34,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "snd_codec.h"
#include "client.h"
-void S_Play_f(void);
-void S_SoundList_f(void);
-void S_Music_f(void);
-
void S_Update_( void );
void S_Base_StopAllSounds(void);
void S_Base_StopBackgroundTrack( void );
@@ -953,7 +949,10 @@ void S_Base_RawSamples( int stream, int samples, int rate, int width, int s_chan
}
rawsamples = s_rawsamples[stream];
- intVolume = 256 * volume * s_volume->value;
+ if(s_muted->integer)
+ intVolume = 0;
+ else
+ intVolume = 256 * volume * s_volume->value;
if ( s_rawend[stream] < s_soundtime ) {
Com_DPrintf( "S_Base_RawSamples: resetting minimum: %i < %i\n", s_rawend[stream], s_soundtime );
@@ -1328,7 +1327,9 @@ void S_Base_StartBackgroundTrack( const char *intro, const char *loop ){
}
Com_DPrintf( "S_StartBackgroundTrack( %s, %s )\n", intro, loop );
- if ( !intro[0] ) {
+ if(!*intro)
+ {
+ S_Base_StopBackgroundTrack();
return;
}