From 778fa713a6449813ed5aa27c64e2e322239ca94e Mon Sep 17 00:00:00 2001
From: Jeff Teunissen <deek@d2dc.net>
Date: Fri, 1 Dec 2000 08:57:54 +0000
Subject: [PATCH] Fix snd_null crash (Cvars undefined, segfault)

---
 source/snd_null.c | 66 +++++++++++++++++++++++++++++++++--------------
 1 file changed, 46 insertions(+), 20 deletions(-)

diff --git a/source/snd_null.c b/source/snd_null.c
index 101cb92..c3de40e 100644
--- a/source/snd_null.c
+++ b/source/snd_null.c
@@ -47,72 +47,98 @@ cvar_t	*bgmvolume;
 cvar_t	*volume;
 
 
-void S_Init (void)
+void
+S_Init (void)
+{
+	S_Init_Cvars ();
+}
+
+void
+S_Init_Cvars (void)
+{
+	volume = Cvar_Get("volume",  "0.7", CVAR_ARCHIVE, "None");
+	loadas8bit = Cvar_Get("loadas8bit",  "0", CVAR_NONE, "None");
+	bgmvolume = Cvar_Get("bgmvolume",  "1", CVAR_ARCHIVE, "None");
+}
+
+void
+S_AmbientOff (void)
 {
 }
 
-void S_AmbientOff (void)
+void
+S_AmbientOn (void)
 {
 }
 
-void S_AmbientOn (void)
+void
+S_Shutdown (void)
 {
 }
 
-void S_Shutdown (void)
+void
+S_TouchSound (char *sample)
 {
 }
 
-void S_TouchSound (char *sample)
+void
+S_ClearBuffer (void)
 {
 }
 
-void S_ClearBuffer (void)
+void
+S_StaticSound (sfx_t *sfx, vec3_t origin, float vol, float attenuation)
 {
 }
 
-void S_StaticSound (sfx_t *sfx, vec3_t origin, float vol, float attenuation)
+void
+S_StartSound (int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float fvol,  float attenuation)
 {
 }
 
-void S_StartSound (int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float fvol,  float attenuation)
+void
+S_StopSound (int entnum, int entchannel)
 {
 }
 
-void S_StopSound (int entnum, int entchannel)
-{
-}
-
-sfx_t *S_PrecacheSound (char *sample)
+sfx_t *
+S_PrecacheSound (char *sample)
 {
 	return NULL;
 }
 
-void S_ClearPrecache (void)
+void
+S_ClearPrecache (void)
 {
 }
 
-void S_Update (vec3_t origin, vec3_t v_forward, vec3_t v_right, vec3_t v_up)
+void
+S_Update (vec3_t origin, vec3_t v_forward, vec3_t v_right, vec3_t v_up)
 {
 }
 
-void S_StopAllSounds (qboolean clear)
+void
+S_StopAllSounds (qboolean clear)
 {
 }
 
-void S_BeginPrecaching (void)
+void
+S_BeginPrecaching (void)
 {
 }
 
-void S_EndPrecaching (void)
+void
+S_EndPrecaching (void)
 {
 }
 
-void S_ExtraUpdate (void)
+void
+S_ExtraUpdate (void)
 {
 }
 
-void S_LocalSound (char *s)
+void
+S_LocalSound (char *s)
 {
 }