Merge remote branch 'origin/master' into akari/irc

[xonotic/darkplaces.git] / snd_null.c

diff --git a/snd_null.c b/snd_null.c
index bc71a4f30835082a6164a480c8c333bcccdd7817..8385964425053d17c5f7a18f664b6bb219ba2101 100755 (executable)
--- a/snd_null.c
+++ b/snd_null.c
@@ -74,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)
 {
 }
 
@@ -95,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;
 }