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

diff --git a/cd_linux.c b/cd_linux.c
index 24ebeb82a35d341df9895a90da9ac35c2047ae63..7d523795aa15ef283f23cb99c78179abee64e1a9 100644 (file)
--- 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 628e26e5d0210a0168f0adea4962d4532b4efabb..e1a3a30034967a1e342185873984d26a8efbdddb 100644 (file)
--- 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 fb68eea4cfd7ee1e1dff36590f3f0f2d3984ed41..9cb8f9bd3dfcec5762398f8f487eaecdde1697aa 100644 (file)
--- 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 1523b46f76722e3c00e1e29ada252391add9dfd6..188dad8e4c69ae18fd7ec18bd54d664987768f71 100644 (file)
--- 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 9b013896b6259cc5c90898e0b90adc98dfa113d2..b8627b9218961bf6aea6712f179f9d839fedec0b 100755 (executable)
--- 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)