X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=sound.h;h=5a9a72dfb738decd52f953ebb82446582543bc54;hb=316549daf20e3a6a71841f87da516f7bb9cf340f;hp=6a5813174ec92b0b4c8139518899bcf3ed9004a3;hpb=e9ef9da90a206204b283dacd15c35bd3fd1fe5c9;p=xonotic%2Fdarkplaces.git

diff --git a/sound.h b/sound.h
index 6a581317..5a9a72df 100644
--- a/sound.h
+++ b/sound.h
@@ -21,8 +21,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef SOUND_H
 #define SOUND_H
 
-#include "cmd.h"
 #include "matrixlib.h"
+struct cmd_state_s;
 
 
 // ====================================================================
@@ -47,12 +47,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 typedef struct sfx_s sfx_t;
 
-extern cvar_t mastervolume;
-extern cvar_t bgmvolume;
-extern cvar_t volume;
-extern cvar_t snd_initialized;
-extern cvar_t snd_staticvolume;
-extern cvar_t snd_mutewhenidle;
+extern struct cvar_s mastervolume;
+extern struct cvar_s bgmvolume;
+extern struct cvar_s volume;
+extern struct cvar_s snd_initialized;
+extern struct cvar_s snd_staticvolume;
+extern struct cvar_s snd_mutewhenidle;
 
 
 // ====================================================================
@@ -64,7 +64,7 @@ void S_Terminate (void);
 
 void S_Startup (void);
 void S_Shutdown (void);
-void S_UnloadAllSounds_f(cmd_state_t *cmd);
+void S_UnloadAllSounds_f(struct cmd_state_s *cmd);
 
 void S_Update(const matrix4x4_t *listenermatrix);
 void S_ExtraUpdate (void);
@@ -98,12 +98,13 @@ sfx_t *S_FindName(const char *name);
 // S_StartSound returns the channel index, or -1 if an error occurred
 int S_StartSound (int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float fvol, float attenuation);
 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);
+qbool S_LocalSoundEx (const char *s, int chan, float fvol);
 qbool S_LocalSound (const char *s);
 
 void S_StaticSound (sfx_t *sfx, vec3_t origin, float fvol, float attenuation);
 void S_StopSound (int entnum, int entchannel);
 void S_StopAllSounds (void);
-void S_StopAllSounds_f(cmd_state_t *cmd);
+void S_StopAllSounds_f(struct cmd_state_s *cmd);
 void S_PauseGameSounds (qbool toggle);
 
 void S_StopChannel (unsigned int channel_ind, qbool lockmutex, qbool freesfx);