From e61e64e24dc955e55dee4b26ffa4ea1e6fbe7701 Mon Sep 17 00:00:00 2001
From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Mon, 8 Dec 2003 07:58:28 +0000
Subject: [PATCH] fixed gcc and linux related compilation problems from Black's
 recent commit

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@3709 d7cf8633-e32d-0410-b094-e92efae38249
---
 cd_linux.c  | 2 +-
 cd_null.c   | 3 ++-
 prvm_cmds.c | 2 +-
 snd_dma.c   | 1 -
 snd_null.c  | 3 ++-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/cd_linux.c b/cd_linux.c
index 24ebeb82..7d523795 100644
--- a/cd_linux.c
+++ b/cd_linux.c
@@ -36,7 +36,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "quakedef.h"
 
 // used by menu to ghost CD audio slider
-qboolean cdaudioinitialized = false;
+cvar_t	cdaudioinitialized = {CVAR_READONLY,"cdaudioinitialized","0"};
 static qboolean cdValid = false;
 static qboolean playing = false;
 static qboolean wasPlaying = false;
diff --git a/cd_null.c b/cd_null.c
index 628e26e5..e1a3a300 100644
--- a/cd_null.c
+++ b/cd_null.c
@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 #include "quakedef.h"
 
-qboolean cdaudioinitialized = false;
+cvar_t	cdaudioinitialized = {CVAR_READONLY,"cdaudioinitialized","0"};
 
 void CDAudio_Play(qbyte track, qboolean looping)
 {
@@ -48,6 +48,7 @@ void CDAudio_Update(void)
 
 int CDAudio_Init(void)
 {
+	Cvar_RegisterVariable(&cdaudioinitialized);
 	return 0;
 }
 
diff --git a/prvm_cmds.c b/prvm_cmds.c
index fb68eea4..9cb8f9bd 100644
--- a/prvm_cmds.c
+++ b/prvm_cmds.c
@@ -3201,4 +3201,4 @@ void VM_M_Cmd_Reset(void)
 {
 	//VM_Cmd_Init();
 	VM_Cmd_Reset();
-}
\ No newline at end of file
+}
diff --git a/snd_dma.c b/snd_dma.c
index 1523b46f..188dad8e 100644
--- a/snd_dma.c
+++ b/snd_dma.c
@@ -42,7 +42,6 @@ int total_channels;
 
 int snd_blocked = 0;
 static qboolean snd_ambient = 1;
-//qboolean snd_initialized = false;
 cvar_t snd_initialized = { CVAR_READONLY, "snd_initialized", "0"};
 
 // pointer should go away
diff --git a/snd_null.c b/snd_null.c
index 9b013896..b8627b92 100755
--- a/snd_null.c
+++ b/snd_null.c
@@ -26,13 +26,14 @@ cvar_t bgmvolume = {CVAR_SAVE, "bgmvolume", "1"};
 cvar_t volume = {CVAR_SAVE, "volume", "0.7"};
 cvar_t snd_staticvolume = {CVAR_SAVE, "snd_staticvolume", "1"};
 
-qboolean snd_initialized = false;
+cvar_t snd_initialized = { CVAR_READONLY, "snd_initialized", "0"};
 
 void S_Init (void)
 {
 	Cvar_RegisterVariable(&bgmvolume);
 	Cvar_RegisterVariable(&volume);
 	Cvar_RegisterVariable(&snd_staticvolume);
+	Cvar_RegisterVariable(&snd_initialized);
 }
 
 void S_AmbientOff (void)
-- 
2.39.2