X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=snd_null.c;h=f290ed152546b99be1f01caf19ff91059d159479;hp=3b8218cab5d99e45aa446d978724bdf1d45d9e7b;hb=b5f2509c170bf13f83cdb0e5d25f9cfc7469e986;hpb=ee0301171ddfb3f95478ef1d2a2616db5f7153c4

diff --git a/snd_null.c b/snd_null.c
index 3b8218ca..f290ed15 100755
--- a/snd_null.c
+++ b/snd_null.c
@@ -22,12 +22,12 @@ 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"};
-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)
 {
@@ -69,21 +69,16 @@ int S_StartSound (int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float f
 	return -1;
 }
 
-int S_StartSound_StartPosition (int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float fvol, float attenuation, float startposition)
+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;
 }
 
-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)
+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;
 }
@@ -92,7 +87,7 @@ void S_StopSound (int entnum, int entchannel)
 {
 }
 
-void S_PauseGameSounds (qboolean toggle)
+void S_PauseGameSounds (qbool toggle)
 {
 }
 
@@ -100,7 +95,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, qbool complain, qbool levelsound)
 {
 	return NULL;
 }
@@ -110,12 +105,12 @@ float S_SoundLength(const char *name)
 	return -1;
 }
 
-qboolean S_IsSoundPrecached (const sfx_t *sfx)
+qbool S_IsSoundPrecached (const sfx_t *sfx)
 {
 	return false;
 }
 
-void S_UnloadAllSounds_f (void)
+void S_UnloadAllSounds_f (cmd_state_t *cmd)
 {
 }
 
@@ -136,7 +131,12 @@ void S_ExtraUpdate (void)
 {
 }
 
-qboolean S_LocalSound (const char *s)
+qbool S_LocalSound (const char *s)
+{
+	return false;
+}
+
+qbool S_LocalSoundEx (const char *s, int chan, float fvol)
 {
 	return false;
 }