zone: Use the generic linked list

[xonotic/darkplaces.git] / sound.h

diff --git a/sound.h b/sound.h
index 6a5813174ec92b0b4c8139518899bcf3ed9004a3..697ded8e26e31af98ac2f39b6749d27345b543d6 100644 (file)
--- 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);
@@ -103,7 +103,7 @@ 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);