From b7bbda4c94b70c1be23173bcc386fa4640b7d305 Mon Sep 17 00:00:00 2001 From: sezero Date: Thu, 29 Dec 2011 21:21:11 +0000 Subject: [PATCH] changed some of the Cvar_Set[Value] calls to their *Quick variants in the source files where the vars are defined. git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@576 af15c1b1-3010-417e-b628-4374ebc0bcbd --- Quake/bgmusic.c | 4 ++-- Quake/gl_screen.c | 12 +++++----- Quake/gl_vidsdl.c | 56 +++++++++++++++++++++++------------------------ Quake/host.c | 4 ++-- Quake/snd_dma.c | 4 ++-- Quake/sv_main.c | 2 +- 6 files changed, 41 insertions(+), 41 deletions(-) diff --git a/Quake/bgmusic.c b/Quake/bgmusic.c index a16e54e6..e99da2ae 100644 --- a/Quake/bgmusic.c +++ b/Quake/bgmusic.c @@ -440,9 +440,9 @@ void BGM_Update (void) if (old_volume != bgmvolume.value) { if (bgmvolume.value < 0) - Cvar_Set ("bgmvolume", "0"); + Cvar_SetQuick (&bgmvolume, "0"); else if (bgmvolume.value > 1) - Cvar_Set ("bgmvolume", "1"); + Cvar_SetQuick (&bgmvolume, "1"); old_volume = bgmvolume.value; } if (bgmstream) diff --git a/Quake/gl_screen.c b/Quake/gl_screen.c index c5648fb7..d161bc78 100644 --- a/Quake/gl_screen.c +++ b/Quake/gl_screen.c @@ -266,15 +266,15 @@ static void SCR_CalcRefdef (void) // bound viewsize if (scr_viewsize.value < 30) - Cvar_Set ("viewsize","30"); + Cvar_SetQuick (&scr_viewsize, "30"); if (scr_viewsize.value > 120) - Cvar_Set ("viewsize","120"); + Cvar_SetQuick (&scr_viewsize, "120"); // bound fov if (scr_fov.value < 10) - Cvar_Set ("fov","10"); + Cvar_SetQuick (&scr_fov, "10"); if (scr_fov.value > 170) - Cvar_Set ("fov","170"); + Cvar_SetQuick (&scr_fov, "170"); vid.recalc_refdef = 0; @@ -315,7 +315,7 @@ Keybinding command */ void SCR_SizeUp_f (void) { - Cvar_SetValue ("viewsize",scr_viewsize.value+10); + Cvar_SetValueQuick (&scr_viewsize, scr_viewsize.value+10); } @@ -328,7 +328,7 @@ Keybinding command */ void SCR_SizeDown_f (void) { - Cvar_SetValue ("viewsize",scr_viewsize.value-10); + Cvar_SetValueQuick (&scr_viewsize, scr_viewsize.value-10); } static void SCR_Callback_refdef (cvar_t *var) diff --git a/Quake/gl_vidsdl.c b/Quake/gl_vidsdl.c index 6defd21f..4bd74411 100644 --- a/Quake/gl_vidsdl.c +++ b/Quake/gl_vidsdl.c @@ -439,10 +439,10 @@ void VID_Restart (void) // // keep cvars in line with actual mode // - Cvar_Set ("vid_width", va("%i", modelist[vid_default].width)); - Cvar_Set ("vid_height", va("%i", modelist[vid_default].height)); - Cvar_Set ("vid_bpp", va("%i", modelist[vid_default].bpp)); - Cvar_Set ("vid_fullscreen", (windowed) ? "0" : "1"); + Cvar_SetQuick (&vid_width, va("%i", modelist[vid_default].width)); + Cvar_SetQuick (&vid_height, va("%i", modelist[vid_default].height)); + Cvar_SetQuick (&vid_bpp, va("%i", modelist[vid_default].bpp)); + Cvar_SetQuick (&vid_fullscreen, (windowed) ? "0" : "1"); } /* @@ -467,10 +467,10 @@ void VID_Test (void) if (!SCR_ModalMessage("Would you like to keep this\nvideo mode? (y/n)\n", 5.0f)) { //revert cvars and mode - Cvar_Set ("vid_width", va("%i", oldmode.width)); - Cvar_Set ("vid_height", va("%i", oldmode.height)); - Cvar_Set ("vid_bpp", va("%i", oldmode.bpp)); - Cvar_Set ("vid_fullscreen", (oldmode.type == MODE_WINDOWED) ? "0" : "1"); + Cvar_SetQuick (&vid_width, va("%i", oldmode.width)); + Cvar_SetQuick (&vid_height, va("%i", oldmode.height)); + Cvar_SetQuick (&vid_bpp, va("%i", oldmode.bpp)); + Cvar_SetQuick (&vid_fullscreen, (oldmode.type == MODE_WINDOWED) ? "0" : "1"); VID_Restart (); } } @@ -485,10 +485,10 @@ void VID_Unlock (void) vid_locked = false; //sync up cvars in case they were changed during the lock - Cvar_Set ("vid_width", va("%i", modelist[vid_default].width)); - Cvar_Set ("vid_height", va("%i", modelist[vid_default].height)); - Cvar_Set ("vid_bpp", va("%i", modelist[vid_default].bpp)); - Cvar_Set ("vid_fullscreen", (windowed) ? "0" : "1"); + Cvar_SetQuick (&vid_width, va("%i", modelist[vid_default].width)); + Cvar_SetQuick (&vid_height, va("%i", modelist[vid_default].height)); + Cvar_SetQuick (&vid_bpp, va("%i", modelist[vid_default].bpp)); + Cvar_SetQuick (&vid_fullscreen, (windowed) ? "0" : "1"); } /* @@ -1185,11 +1185,11 @@ void VID_Init (void) if (COM_CheckParm("-window") || COM_CheckParm("-w")) { - Cvar_Set ("vid_fullscreen", "0"); + Cvar_SetQuick (&vid_fullscreen, "0"); } else if (COM_CheckParm("-fullscreen") || COM_CheckParm("-f")) { - Cvar_Set ("vid_fullscreen", "1"); + Cvar_SetQuick (&vid_fullscreen, "1"); } if (!vid_fullscreen.value) @@ -1316,7 +1316,7 @@ void VID_Init (void) // Still no luck? Default to windowed mode if (vid_default == NO_MODE) { - Cvar_Set ("vid_fullscreen", "0"); + Cvar_SetQuick (&vid_fullscreen, "0"); windowed = true; vid_default = MODE_WINDOWED; } @@ -1374,14 +1374,14 @@ void VID_Toggle (void) else vid.type = MODE_FULLSCREEN_DEFAULT; - Cvar_SetValue ("vid_fullscreen", ! (int)vid_fullscreen.value); + Cvar_SetQuick (&vid_fullscreen, vid_fullscreen.value ? "0" : "1"); } else { vid_toggle_works = false; Con_Printf ("ToggleFullScreen failed, attempting VID_Restart\n"); vrestart: - Cvar_SetValue ("vid_fullscreen", ! (int)vid_fullscreen.value); + Cvar_SetQuick (&vid_fullscreen, vid_fullscreen.value ? "0" : "1"); Cbuf_AddText ("vid_restart\n"); } } @@ -1395,13 +1395,13 @@ void VID_SyncCvars (void) { int swap_control; - Cvar_Set ("vid_width", va("%i", modelist[vid_default].width)); - Cvar_Set ("vid_height", va("%i", modelist[vid_default].height)); - Cvar_Set ("vid_bpp", va("%i", modelist[vid_default].bpp)); - Cvar_Set ("vid_fullscreen", (windowed) ? "0" : "1"); + Cvar_SetQuick (&vid_width, va("%i", modelist[vid_default].width)); + Cvar_SetQuick (&vid_height, va("%i", modelist[vid_default].height)); + Cvar_SetQuick (&vid_bpp, va("%i", modelist[vid_default].bpp)); + Cvar_SetQuick (&vid_fullscreen, (windowed) ? "0" : "1"); if (SDL_GL_GetAttribute(SDL_GL_SWAP_CONTROL, &swap_control) == 0) - Cvar_Set ("vid_vsync", (swap_control) ? "1" : "0"); + Cvar_SetQuick (&vid_vsync, (swap_control) ? "1" : "0"); } //========================================================================== @@ -1495,7 +1495,7 @@ void VID_Menu_RebuildBppList (void) //if there are no valid fullscreen bpps for this width/height, just pick one if (vid_menu_numbpps == 0) { - Cvar_SetValue ("vid_bpp",(float)modelist[0].bpp); + Cvar_SetValueQuick (&vid_bpp, (float)modelist[0].bpp); return; } @@ -1505,7 +1505,7 @@ void VID_Menu_RebuildBppList (void) break; if (i == vid_menu_numbpps) - Cvar_SetValue ("vid_bpp",(float)vid_menu_bpps[0]); + Cvar_SetValueQuick (&vid_bpp, (float)vid_menu_bpps[0]); } /* @@ -1542,8 +1542,8 @@ void VID_Menu_ChooseNextMode (int dir) i = vid_menu_nummodes-1; } - Cvar_SetValue ("vid_width",(float)vid_menu_modes[i].width); - Cvar_SetValue ("vid_height",(float)vid_menu_modes[i].height); + Cvar_SetValueQuick (&vid_width, (float)vid_menu_modes[i].width); + Cvar_SetValueQuick (&vid_height, (float)vid_menu_modes[i].height); VID_Menu_RebuildBppList (); } } @@ -1580,7 +1580,7 @@ void VID_Menu_ChooseNextBpp (int dir) i = vid_menu_numbpps-1; } - Cvar_SetValue ("vid_bpp",(float)vid_menu_bpps[i]); + Cvar_SetValueQuick (&vid_bpp, (float)vid_menu_bpps[i]); } } @@ -1617,7 +1617,7 @@ void VID_Menu_ChooseNextRate (int dir) i = vid_menu_numrates-1; } - Cvar_SetValue ("vid_refreshrate",(float)vid_menu_rates[i]); + Cvar_SetValueQuick (&vid_refreshrate, (float)vid_menu_rates[i]); } #endif } diff --git a/Quake/host.c b/Quake/host.c index 9d3fc82c..48fc92a2 100644 --- a/Quake/host.c +++ b/Quake/host.c @@ -219,9 +219,9 @@ void Host_FindMaxClients (void) svs.clients = (struct client_s *) Hunk_AllocName (svs.maxclientslimit*sizeof(client_t), "clients"); if (svs.maxclients > 1) - Cvar_SetValue ("deathmatch", 1.0); + Cvar_SetQuick (&deathmatch, "1"); else - Cvar_SetValue ("deathmatch", 0.0); + Cvar_SetQuick (&deathmatch, "0"); } void Host_Version_f (void) diff --git a/Quake/snd_dma.c b/Quake/snd_dma.c index b5f38b34..5995e12b 100644 --- a/Quake/snd_dma.c +++ b/Quake/snd_dma.c @@ -176,12 +176,12 @@ void S_Init (void) i = COM_CheckParm("-sndspeed"); if (i && i < com_argc-1) { - Cvar_Set ("sndspeed", com_argv[i+1]); + Cvar_SetQuick (&sndspeed, com_argv[i+1]); } if (host_parms->memsize < 0x800000) { - Cvar_Set ("loadas8bit", "1"); + Cvar_SetQuick (&loadas8bit, "1"); Con_Printf ("loading all sounds as 8bit\n"); } diff --git a/Quake/sv_main.c b/Quake/sv_main.c index c227494f..5012aab5 100644 --- a/Quake/sv_main.c +++ b/Quake/sv_main.c @@ -1305,7 +1305,7 @@ void SV_SpawnServer (const char *server) // make cvars consistant // if (coop.value) - Cvar_SetValue ("deathmatch", 0); + Cvar_Set ("deathmatch", "0"); current_skill = (int)(skill.value + 0.5); if (current_skill < 0) current_skill = 0;