X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=snd_null.c;h=8385964425053d17c5f7a18f664b6bb219ba2101;hb=6d89dcbc6b8565b1ee3cb7ec63213efde6c7d988;hp=0b97ef625810e28802e664a14e26967c79eff3af;hpb=99d9ecea9b9c198251a7a44545734c469637144a;p=xonotic%2Fdarkplaces.git

diff --git a/snd_null.c b/snd_null.c
index 0b97ef62..83859644 100755
--- a/snd_null.c
+++ b/snd_null.c
@@ -23,6 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "quakedef.h"
 
 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", "1", "master volume"};
 cvar_t volume = {CVAR_SAVE, "volume", "0.7", "volume of sound effects"};
 cvar_t snd_staticvolume = {CVAR_SAVE, "snd_staticvolume", "1", "volume of ambient sound effects (such as swampy sounds at the start of e1m2)"};
 cvar_t snd_initialized = { CVAR_READONLY, "snd_initialized", "0", "indicates the sound subsystem is active"};
@@ -31,6 +32,7 @@ cvar_t snd_mutewhenidle = {CVAR_SAVE, "snd_mutewhenidle", "1", "whether to disab
 void S_Init (void)
 {
 	Cvar_RegisterVariable(&bgmvolume);
+	Cvar_RegisterVariable(&mastervolume);
 	Cvar_RegisterVariable(&volume);
 	Cvar_RegisterVariable(&snd_staticvolume);
 	Cvar_RegisterVariable(&snd_initialized);
@@ -72,7 +74,12 @@ int S_StartSound_StartPosition (int entnum, int entchannel, sfx_t *sfx, vec3_t o
 	return -1;
 }
 
-void S_StopChannel (unsigned int channel_ind, qboolean lockmutex)
+int S_StartSound_StartPosition_Flags (int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float fvol, float attenuation, float startposition, int flags)
+{
+	return -1;
+}
+
+void S_StopChannel (unsigned int channel_ind, qboolean lockmutex, qboolean freesfx)
 {
 }
 
@@ -93,7 +100,7 @@ void S_SetChannelVolume (unsigned int ch_ind, float fvol)
 {
 }
 
-sfx_t *S_PrecacheSound (const char *sample, qboolean complain, qboolean serversound)
+sfx_t *S_PrecacheSound (const char *sample, qboolean complain, qboolean levelsound)
 {
 	return NULL;
 }
@@ -157,7 +164,7 @@ float S_GetChannelPosition (unsigned int ch_ind)
 	return -1;
 }
 
-float S_GetEntChallelPosition(int entnum, int entchannel)
+float S_GetEntChannelPosition(int entnum, int entchannel)
 {
 	return -1;
 }