X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=snd_null.c;h=f487874a40c35b1505a016eb8038623f39b5443d;hp=0d7276eab7797ca231c0e3505cc36fb9e6390fb6;hb=8d2492ac4364e1a51e7f84c6ea1c34429f060939;hpb=65f6c04779aa58c69929e0d22967bf152dac17c1

diff --git a/snd_null.c b/snd_null.c
index 0d7276ea..f487874a 100755
--- a/snd_null.c
+++ b/snd_null.c
@@ -22,15 +22,17 @@ 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 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"};
-cvar_t snd_mutewhenidle = {CVAR_SAVE, "snd_mutewhenidle", "1", "whether to disable sound output when game window is inactive"};
+cvar_t bgmvolume = {CF_ARCHIVE, "bgmvolume", "1", "volume of background music (such as CD music or replacement files such as sound/cdtracks/track002.ogg)"};
+cvar_t mastervolume = {CF_ARCHIVE, "mastervolume", "1", "master volume"};
+cvar_t volume = {CF_ARCHIVE, "volume", "0.7", "volume of sound effects"};
+cvar_t snd_staticvolume = {CF_ARCHIVE, "snd_staticvolume", "1", "volume of ambient sound effects (such as swampy sounds at the start of e1m2)"};
+cvar_t snd_initialized = { CF_READONLY, "snd_initialized", "0", "indicates the sound subsystem is active"};
+cvar_t snd_mutewhenidle = {CF_ARCHIVE, "snd_mutewhenidle", "1", "whether to disable sound output when game window is inactive"};
 
 void S_Init (void)
 {
 	Cvar_RegisterVariable(&bgmvolume);
+	Cvar_RegisterVariable(&mastervolume);
 	Cvar_RegisterVariable(&volume);
 	Cvar_RegisterVariable(&snd_staticvolume);
 	Cvar_RegisterVariable(&snd_initialized);
@@ -67,11 +69,16 @@ int S_StartSound (int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float f
 	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, float fspeed)
+{
+	return -1;
+}
+
+void S_StopChannel (unsigned int channel_ind, qbool lockmutex, qbool freesfx)
 {
 }
 
-qboolean S_SetChannelFlag (unsigned int ch_ind, unsigned int flag, qboolean value)
+qbool S_SetChannelFlag (unsigned int ch_ind, unsigned int flag, qbool value)
 {
 	return false;
 }
@@ -80,7 +87,7 @@ void S_StopSound (int entnum, int entchannel)
 {
 }
 
-void S_PauseGameSounds (qboolean toggle)
+void S_PauseGameSounds (qbool toggle)
 {
 }
 
@@ -88,17 +95,22 @@ 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, qbool complain, qbool levelsound)
 {
 	return NULL;
 }
 
-qboolean S_IsSoundPrecached (const sfx_t *sfx)
+float S_SoundLength(const char *name)
+{
+	return -1;
+}
+
+qbool S_IsSoundPrecached (const sfx_t *sfx)
 {
 	return false;
 }
 
-void S_UnloadAllSounds_f (void)
+void S_UnloadAllSounds_f (cmd_state_t *cmd)
 {
 }
 
@@ -119,7 +131,7 @@ void S_ExtraUpdate (void)
 {
 }
 
-qboolean S_LocalSound (const char *s)
+qbool S_LocalSound (const char *s)
 {
 	return false;
 }
@@ -147,6 +159,11 @@ float S_GetChannelPosition (unsigned int ch_ind)
 	return -1;
 }
 
+float S_GetEntChannelPosition(int entnum, int entchannel)
+{
+	return -1;
+}
+
 void SndSys_SendKeyEvents(void)
 {
 }