fix a few warnings

[xonotic/darkplaces.git] / snd_main.c

diff --git a/snd_main.c b/snd_main.c
index 309dd34cd18674bc9c268dfe308cb7de8fcc458f..52dde53fa4c3df6045de3dd82eb68d56f2cfbb91 100644 (file)
--- a/snd_main.c
+++ b/snd_main.c
@@ -157,6 +157,7 @@ spatialmethod_t spatialmethod;
 
 // Cvars declared in sound.h (part of the sound API)
 cvar_t bgmvolume = {CVAR_SAVE, "bgmvolume", "1", "volume of background music (such as CD music or replacement files such as sound/cdtracks/track002.ogg)"};
+cvar_t mastervolume = {CVAR_SAVE, "mastervolume", "0.7", "master volume"};
 cvar_t volume = {CVAR_SAVE, "volume", "0.7", "volume of sound effects"};
 cvar_t snd_initialized = { CVAR_READONLY, "snd_initialized", "0", "indicates the sound subsystem is active"};
 cvar_t snd_staticvolume = {CVAR_SAVE, "snd_staticvolume", "1", "volume of ambient sound effects (such as swampy sounds at the start of e1m2)"};
@@ -771,6 +772,7 @@ void S_Init(void)
 {
        Cvar_RegisterVariable(&volume);
        Cvar_RegisterVariable(&bgmvolume);
+       Cvar_RegisterVariable(&mastervolume);
        Cvar_RegisterVariable(&snd_staticvolume);
        Cvar_RegisterVariable(&snd_entchannel0volume);
        Cvar_RegisterVariable(&snd_entchannel1volume);
@@ -1672,7 +1674,8 @@ static void S_SetChannelVolume_WithSfx (unsigned int ch_ind, float fvol, sfx_t *
 void S_SetChannelVolume(unsigned int ch_ind, float fvol)
 {
        sfx_t *sfx = channels[ch_ind].sfx;
-       S_SetChannelVolume_WithSfx(ch_ind, fvol, sfx);
+       if(sfx)
+               S_SetChannelVolume_WithSfx(ch_ind, fvol, sfx);
 }
 
 float S_GetChannelPosition (unsigned int ch_ind)
@@ -1692,7 +1695,7 @@ float S_GetChannelPosition (unsigned int ch_ind)
        return (s % sfx->total_length) / (float) S_GetSoundRate();
 }
 
-float S_GetEntChallelPosition(int entnum, int entchannel)
+float S_GetEntChannelPosition(int entnum, int entchannel)
 {
        channel_t *ch;
        unsigned int i;