From eb3aa49bcc51a01aff898d29ef285dbc4637eb99 Mon Sep 17 00:00:00 2001 From: havoc Date: Sat, 18 Dec 2004 01:37:29 +0000 Subject: [PATCH] renamed cl_stainmapsclearonload to cl_stainmaps_clearonload to make it ignore the setting in old configs git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@4850 d7cf8633-e32d-0410-b094-e92efae38249 --- cl_main.c | 4 ++-- client.h | 2 +- menu.c | 6 +++--- model_shared.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cl_main.c b/cl_main.c index 882d9c9d..8f3e00b2 100644 --- a/cl_main.c +++ b/cl_main.c @@ -53,7 +53,7 @@ cvar_t cl_explosions_size_end = {CVAR_SAVE, "cl_explosions_size_end", "128"}; cvar_t cl_explosions_lifetime = {CVAR_SAVE, "cl_explosions_lifetime", "0.5"}; cvar_t cl_stainmaps = {CVAR_SAVE, "cl_stainmaps", "1"}; -cvar_t cl_stainmapsclearonload = {CVAR_SAVE, "cl_stainmapsclearonload", "1"}; +cvar_t cl_stainmaps_clearonload = {CVAR_SAVE, "cl_stainmaps_clearonload", "1"}; cvar_t cl_beams_polygons = {CVAR_SAVE, "cl_beams_polygons", "1"}; cvar_t cl_beams_relative = {CVAR_SAVE, "cl_beams_relative", "1"}; @@ -1367,7 +1367,7 @@ void CL_Init (void) Cvar_RegisterVariable(&cl_explosions_size_end); Cvar_RegisterVariable(&cl_explosions_lifetime); Cvar_RegisterVariable(&cl_stainmaps); - Cvar_RegisterVariable(&cl_stainmapsclearonload); + Cvar_RegisterVariable(&cl_stainmaps_clearonload); Cvar_RegisterVariable(&cl_beams_polygons); Cvar_RegisterVariable(&cl_beams_relative); Cvar_RegisterVariable(&cl_beams_lightatend); diff --git a/client.h b/client.h index d2ba51c3..5b6d6b34 100644 --- a/client.h +++ b/client.h @@ -638,7 +638,7 @@ extern cvar_t cl_explosions_size_start; extern cvar_t cl_explosions_size_end; extern cvar_t cl_explosions_lifetime; extern cvar_t cl_stainmaps; -extern cvar_t cl_stainmapsclearonload; +extern cvar_t cl_stainmaps_clearonload; extern cvar_t cl_prydoncursor; diff --git a/menu.c b/menu.c index debe0840..4e5fb586 100644 --- a/menu.c +++ b/menu.c @@ -1491,7 +1491,7 @@ void M_Menu_Options_Effects_f (void) extern cvar_t r_detailtextures; extern cvar_t cl_stainmaps; -extern cvar_t cl_stainmapsclearonload; +extern cvar_t cl_stainmaps_clearonload; extern cvar_t r_explosionclip; extern cvar_t r_modellights; extern cvar_t r_coronas; @@ -1521,7 +1521,7 @@ void M_Menu_Options_Effects_AdjustSliders (int dir) else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_explosions_shell, !cl_particles_explosions_shell.integer); else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_explosionclip, !r_explosionclip.integer); else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_stainmaps, !cl_stainmaps.integer); - else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_stainmapsclearonload, !cl_stainmapsclearonload.integer); + else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_stainmaps_clearonload, !cl_stainmaps_clearonload.integer); else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_decals, !cl_decals.integer); else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_detailtextures, !r_detailtextures.integer); else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_bulletimpacts, !cl_particles_bulletimpacts.integer); @@ -1576,7 +1576,7 @@ void M_Options_Effects_Draw (void) M_Options_PrintCheckbox(" Explosion Shell", true, cl_particles_explosions_shell.integer); M_Options_PrintCheckbox(" Explosion Shell Clip", true, r_explosionclip.integer); M_Options_PrintCheckbox(" Stainmaps", true, cl_stainmaps.integer); - M_Options_PrintCheckbox("Onload Clear Stainmaps", true, cl_stainmapsclearonload.integer); + M_Options_PrintCheckbox("Onload Clear Stainmaps", true, cl_stainmaps_clearonload.integer); M_Options_PrintCheckbox(" Decals", true, cl_decals.integer); M_Options_PrintCheckbox(" Detail Texturing", true, r_detailtextures.integer); M_Options_PrintCheckbox(" Bullet Impacts", true, cl_particles_bulletimpacts.integer); diff --git a/model_shared.c b/model_shared.c index c5e9d2f6..6c31882d 100644 --- a/model_shared.c +++ b/model_shared.c @@ -197,7 +197,7 @@ static void mod_newmap(void) msurface_t *surf; int i, surfnum, ssize, tsize; - if (!cl_stainmapsclearonload.integer) + if (!cl_stainmaps_clearonload.integer) return; for (i=0; i