changed bgmvolume/volume to always be registered, sliders for them always work (even...

changed all Cvar_SetValue calls to Cvar_SetValueQuick

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@1527 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/cd_linux.c b/cd_linux.c
index 5a37ff2075f2bf778320a10b1b50fbc82afd31ec..bdfea6068879c8c2956f0ca3297ed26c8c15cbde 100644 (file)
--- a/cd_linux.c
+++ b/cd_linux.c
@@ -35,6 +35,8 @@ 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;
 static qboolean cdValid = false;
 static qboolean        playing = false;
 static qboolean        wasPlaying = false;
@@ -202,7 +204,7 @@ void CDAudio_Resume(void)
        if (!wasPlaying)
                return;
        
-       if ( ioctl(cdfile, CDROMRESUME) == -1 ) 
+       if ( ioctl(cdfile, CDROMRESUME) == -1 )
                Con_DPrintf("ioctl cdromresume failed\n");
        playing = true;
 }
@@ -337,13 +339,13 @@ void CDAudio_Update(void)
        {
                if (cdvolume)
                {
-                       Cvar_SetValue ("bgmvolume", 0.0);
+                       Cvar_SetValueQuick (&bgmvolume, 0.0);
                        cdvolume = bgmvolume.value;
                        CDAudio_Pause ();
                }
                else
                {
-                       Cvar_SetValue ("bgmvolume", 1.0);
+                       Cvar_SetValueQuick (&bgmvolume, 1.0);
                        cdvolume = bgmvolume.value;
                        CDAudio_Resume ();
                }
@@ -389,6 +391,7 @@ int CDAudio_Init(void)
 
        for (i = 0; i < 100; i++)
                remap[i] = i;
+       cdaudioinitialized = true;
        initialized = true;
        enabled = true;
 

diff --git a/cd_win.c b/cd_win.c
index 5ef677d04721f9f386ce15f3d5c963e9b6211582..7766e552601594732b27974af21c3b3b2e5df115 100644 (file)
--- a/cd_win.c
+++ b/cd_win.c
@@ -25,6 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 extern HWND    mainwindow;
 
+qboolean cdaudioinitialized = false;
 static qboolean cdValid = false;
 static qboolean        playing = false;
 static qboolean        wasPlaying = false;
@@ -402,13 +403,13 @@ void CDAudio_Update(void)
        {
                if (cdvolume)
                {
-                       Cvar_SetValue ("bgmvolume", 0.0);
+                       Cvar_SetValueQuick (&bgmvolume, 0.0);
                        cdvolume = bgmvolume.value;
                        CDAudio_Pause ();
                }
                else
                {
-                       Cvar_SetValue ("bgmvolume", 1.0);
+                       Cvar_SetValueQuick (&bgmvolume, 1.0);
                        cdvolume = bgmvolume.value;
                        CDAudio_Resume ();
                }
@@ -448,6 +449,7 @@ int CDAudio_Init(void)
 
        for (n = 0; n < 100; n++)
                remap[n] = n;
+       cdaudioinitialized = true;
        initialized = true;
        enabled = true;
 

diff --git a/menu.c b/menu.c
index d1cc9b7203fccc1a8c93b88a4f50fb3bf734e2f1..8320bbf8a53483e692f04bbac02962281d59ac64 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -165,7 +165,7 @@ void M_ItemPrint (float cx, float cy, char *str, int unghosted)
        if (unghosted)
                DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0);
        else
-               DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 0.7, 0.7, 0.7, 1, 0);
+               DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 0.4, 0.4, 0.4, 1, 0);
 }
 
 void M_DrawPic (float cx, float cy, char *picname)
@@ -1270,87 +1270,83 @@ void M_AdjustSliders (int dir)
        switch (options_cursor)
        {
        case 4:
-               Cvar_SetValue ("scr_2dresolution", bound(0, scr_2dresolution.value + dir * 0.2, 1));
+               Cvar_SetValueQuick (&scr_2dresolution, bound(0, scr_2dresolution.value + dir * 0.2, 1));
                break;
        case 5:
-               Cvar_SetValue ("viewsize", bound(30, scr_viewsize.value + dir * 10, 120));
+               Cvar_SetValueQuick (&scr_viewsize, bound(30, scr_viewsize.value + dir * 10, 120));
                break;
        case 6:
-               Cvar_SetValue ("r_skyquality", bound(0, r_skyquality.integer + dir, 2));
+               Cvar_SetValueQuick (&r_skyquality, bound(0, r_skyquality.integer + dir, 2));
                break;
        case 7:
-               Cvar_SetValue ("r_ser", !r_ser.integer);
+               Cvar_SetValueQuick (&r_ser, !r_ser.integer);
                break;
        case 8:
-               Cvar_SetValue ("v_overbrightbits", bound(0, v_overbrightbits.integer + dir, 4));
+               Cvar_SetValueQuick (&v_overbrightbits, bound(0, v_overbrightbits.integer + dir, 4));
                break;
        case 9:
-               Cvar_SetValue ("gl_dither", !gl_dither.integer);
+               Cvar_SetValueQuick (&gl_dither, !gl_dither.integer);
                break;
        case 10:
-               Cvar_SetValue ("v_hwgamma", !v_hwgamma.integer);
+               Cvar_SetValueQuick (&v_hwgamma, !v_hwgamma.integer);
                break;
        case 11:
-               Cvar_SetValue ("v_gamma", bound(1, v_gamma.value + dir * 0.25, 5));
+               Cvar_SetValueQuick (&v_gamma, bound(1, v_gamma.value + dir * 0.25, 5));
                break;
        case 12:
-               Cvar_SetValue ("v_contrast", bound(0.5, v_contrast.value + dir * 0.25, 5));
+               Cvar_SetValueQuick (&v_contrast, bound(0.5, v_contrast.value + dir * 0.25, 5));
                break;
        case 13:
-               Cvar_SetValue ("v_brightness", bound(0, v_brightness.value + dir * 0.05, 0.8));
+               Cvar_SetValueQuick (&v_brightness, bound(0, v_brightness.value + dir * 0.05, 0.8));
                break;
        case 14: // music volume
-               if (Cvar_FindVar("bgmvolume") != NULL)
-               {
-                       #ifdef _WIN32
-                       Cvar_SetValue ("bgmvolume", bound(0, bgmvolume.value + dir * 1.0, 1));
-                       #else
-                       Cvar_SetValue ("bgmvolume", bound(0, bgmvolume.value + dir * 0.1, 1));
-                       #endif
-               }
+               #ifdef _WIN32
+               Cvar_SetValueQuick (&bgmvolume, bound(0, bgmvolume.value + dir * 1.0, 1));
+               #else
+               Cvar_SetValueQuick (&bgmvolume, bound(0, bgmvolume.value + dir * 0.1, 1));
+               #endif
                break;
        case 15: // sfx volume
-               if (Cvar_FindVar("volume") != NULL)
-                       Cvar_SetValue ("volume", bound(0, volume.value + dir * 0.1, 1));
+               Cvar_SetValueQuick (&volume, bound(0, volume.value + dir * 0.1, 1));
                break;
        case 16:
-               Cvar_SetValue ("crosshair", bound(0, crosshair.integer + dir, 5));
+               Cvar_SetValueQuick (&crosshair, bound(0, crosshair.integer + dir, 5));
                break;
        case 17:
-               Cvar_SetValue ("crosshair_size", bound(1, crosshair_size.value + dir, 5));
+               Cvar_SetValueQuick (&crosshair_size, bound(1, crosshair_size.value + dir, 5));
                break;
        case 18: // show framerate
-               Cvar_SetValue ("showfps", !showfps.integer);
+               Cvar_SetValueQuick (&showfps, !showfps.integer);
                break;
        case 19: // always run
                if (cl_forwardspeed.value > 200)
                {
-                       Cvar_SetValue ("cl_forwardspeed", 200);
-                       Cvar_SetValue ("cl_backspeed", 200);
+                       Cvar_SetValueQuick (&cl_forwardspeed, 200);
+                       Cvar_SetValueQuick (&cl_backspeed, 200);
                }
                else
                {
-                       Cvar_SetValue ("cl_forwardspeed", 400);
-                       Cvar_SetValue ("cl_backspeed", 400);
+                       Cvar_SetValueQuick (&cl_forwardspeed, 400);
+                       Cvar_SetValueQuick (&cl_backspeed, 400);
                }
                break;
        case 20: // lookspring
-               Cvar_SetValue ("lookspring", !lookspring.integer);
+               Cvar_SetValueQuick (&lookspring, !lookspring.integer);
                break;
        case 21: // lookstrafe
-               Cvar_SetValue ("lookstrafe", !lookstrafe.integer);
+               Cvar_SetValueQuick (&lookstrafe, !lookstrafe.integer);
                break;
        case 22: // mouse speed
-               Cvar_SetValue ("sensitivity", bound(1, sensitivity.value + dir * 0.5, 50));
+               Cvar_SetValueQuick (&sensitivity, bound(1, sensitivity.value + dir * 0.5, 50));
                break;
        case 23: // mouse look
-               Cvar_SetValue ("freelook", !freelook.integer);
+               Cvar_SetValueQuick (&freelook, !freelook.integer);
                break;
        case 24: // invert mouse
-               Cvar_SetValue ("m_pitch", -m_pitch.value);
+               Cvar_SetValueQuick (&m_pitch, -m_pitch.value);
                break;
        case 25: // windowed mouse
-               Cvar_SetValue ("vid_mouse", !vid_mouse.integer);
+               Cvar_SetValueQuick (&vid_mouse, !vid_mouse.integer);
                break;
        }
 }
@@ -1440,7 +1436,6 @@ void M_Adjust2DResolution(int dir)
 
 void M_Options_Draw (void)
 {
-       int i;
        float y;
        cachepic_t      *p;
 
@@ -1463,10 +1458,8 @@ void M_Options_Draw (void)
        M_ItemPrint(16, y, "                 Gamma", v_hwgamma.integer);M_DrawSlider(220, y, (v_gamma.value - 1) / 4);y += 8;
        M_Print(16, y, "              Contrast");M_DrawSlider(220, y, (v_contrast.value - 0.5) / (5 - 0.5));y += 8;
        M_Print(16, y, "            Brightness");M_DrawSlider(220, y, v_brightness.value / 0.8);y += 8;
-       i = Cvar_FindVar("bgmvolume") != NULL;
-       M_ItemPrint(16, y, "       CD Music Volume", i);if (i) M_DrawSlider(220, y, bgmvolume.value);y += 8;
-       i = Cvar_FindVar("volume") != NULL;
-       M_ItemPrint(16, y, "          Sound Volume", i);if (i) M_DrawSlider(220, y, volume.value);y += 8;
+       M_ItemPrint(16, y, "       CD Music Volume", cdaudioinitialized);M_DrawSlider(220, y, bgmvolume.value);y += 8;
+       M_ItemPrint(16, y, "          Sound Volume", snd_initialized);M_DrawSlider(220, y, volume.value);y += 8;
        M_Print(16, y, "             Crosshair");M_DrawSlider(220, y, crosshair.value / 5);y += 8;
        M_Print(16, y, "        Crosshair Size");M_DrawSlider(220, y, (crosshair_size.value - 1) / 4);y += 8;
        M_Print(16, y, "        Show Framerate");M_DrawCheckbox(220, y, showfps.integer);y += 8;
@@ -2520,13 +2513,13 @@ void M_NetStart_Change (int dir)
        case 2:
                if (deathmatch.integer) // changing from deathmatch to coop
                {
-                       Cvar_SetValue ("coop", 1);
-                       Cvar_SetValue ("deathmatch", 0);
+                       Cvar_SetValueQuick (&coop, 1);
+                       Cvar_SetValueQuick (&deathmatch, 0);
                }
                else // changing from coop to deathmatch
                {
-                       Cvar_SetValue ("coop", 0);
-                       Cvar_SetValue ("deathmatch", 1);
+                       Cvar_SetValueQuick (&coop, 0);
+                       Cvar_SetValueQuick (&deathmatch, 1);
                }
                break;
 
@@ -2536,35 +2529,35 @@ void M_NetStart_Change (int dir)
                else
                        count = 2;
 
-               Cvar_SetValue ("teamplay", teamplay.integer + dir);
+               Cvar_SetValueQuick (&teamplay, teamplay.integer + dir);
                if (teamplay.integer > count)
-                       Cvar_SetValue ("teamplay", 0);
+                       Cvar_SetValueQuick (&teamplay, 0);
                else if (teamplay.integer < 0)
-                       Cvar_SetValue ("teamplay", count);
+                       Cvar_SetValueQuick (&teamplay, count);
                break;
 
        case 4:
-               Cvar_SetValue ("skill", skill.integer + dir);
+               Cvar_SetValueQuick (&skill, skill.integer + dir);
                if (skill.integer > 3)
-                       Cvar_SetValue ("skill", 0);
+                       Cvar_SetValueQuick (&skill, 0);
                if (skill.integer < 0)
-                       Cvar_SetValue ("skill", 3);
+                       Cvar_SetValueQuick (&skill, 3);
                break;
 
        case 5:
-               Cvar_SetValue ("fraglimit", fraglimit.integer + dir*10);
+               Cvar_SetValueQuick (&fraglimit, fraglimit.integer + dir*10);
                if (fraglimit.integer > 100)
-                       Cvar_SetValue ("fraglimit", 0);
+                       Cvar_SetValueQuick (&fraglimit, 0);
                if (fraglimit.integer < 0)
-                       Cvar_SetValue ("fraglimit", 100);
+                       Cvar_SetValueQuick (&fraglimit, 100);
                break;
 
        case 6:
-               Cvar_SetValue ("timelimit", timelimit.value + dir*5);
+               Cvar_SetValueQuick (&timelimit, timelimit.value + dir*5);
                if (timelimit.value > 60)
-                       Cvar_SetValue ("timelimit", 0);
+                       Cvar_SetValueQuick (&timelimit, 0);
                if (timelimit.value < 0)
-                       Cvar_SetValue ("timelimit", 60);
+                       Cvar_SetValueQuick (&timelimit, 60);
                break;
 
        case 7:

diff --git a/snd_dma.c b/snd_dma.c
index e68e96691045524dd6d9ffe2f710c2a44f7f88b9..3817ea4cd52650363f3f89ea7cb43e7a5bc3a237 100644 (file)
--- a/snd_dma.c
+++ b/snd_dma.c
@@ -66,7 +66,6 @@ sfx_t         *ambient_sfx[NUM_AMBIENTS];
 
 int sound_started = 0;
 
-// FIXME: make bgmvolume/volume always be registered for sake of config saving, and add check for whether sound is enabled to menu
 cvar_t bgmvolume = {CVAR_SAVE, "bgmvolume", "1"};
 cvar_t volume = {CVAR_SAVE, "volume", "0.7"};
 
@@ -170,6 +169,9 @@ void S_Init (void)
 {
        Con_Printf("\nSound Initialization\n");
 
+       Cvar_RegisterVariable(&volume);
+       Cvar_RegisterVariable(&bgmvolume);
+
        if (COM_CheckParm("-nosound"))
                return;
 
@@ -186,10 +188,8 @@ void S_Init (void)
        Cmd_AddCommand("soundinfo", S_SoundInfo_f);
 
        Cvar_RegisterVariable(&nosound);
-       Cvar_RegisterVariable(&volume);
        Cvar_RegisterVariable(&precache);
 //     Cvar_RegisterVariable(&loadas8bit);
-       Cvar_RegisterVariable(&bgmvolume);
        Cvar_RegisterVariable(&bgmbuffer);
        Cvar_RegisterVariable(&ambient_level);
        Cvar_RegisterVariable(&ambient_fade);

diff --git a/sound.h b/sound.h
index bf2afa71786a701de5098a54e43869228df305d1..89e56a932cd3108652b7d8d4831253fefb7cacf2 100644 (file)
--- a/sound.h
+++ b/sound.h
@@ -161,6 +161,7 @@ extern cvar_t bgmvolume;
 extern cvar_t volume;
 extern cvar_t snd_swapstereo;
 
+extern qboolean cdaudioinitialized;
 extern qboolean        snd_initialized;
 
 extern int snd_blocked;