Clears stainmaps on map restart/change based on cl_stainmapsclearonload cvar. Also...

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

diff --git a/cl_main.c b/cl_main.c
index 1006559dc7d24c6ca513e3a05454e0a11969eaad..ddc51144b0a277def06999f7ac2c37e1b692396c 100644 (file)
--- a/cl_main.c
+++ b/cl_main.c
@@ -53,6 +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", "0"};
 
 cvar_t cl_beams_polygons = {CVAR_SAVE, "cl_beams_polygons", "1"};
 cvar_t cl_beams_relative = {CVAR_SAVE, "cl_beams_relative", "1"};
@@ -1325,6 +1326,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_beams_polygons);
        Cvar_RegisterVariable(&cl_beams_relative);
        Cvar_RegisterVariable(&cl_beams_lightatend);

diff --git a/client.h b/client.h
index 38ef0b7983fcaf207c1a33b835b1db145dba29f6..13d285939852f6c8f2de6c4ee362aebbfd050f7c 100644 (file)
--- a/client.h
+++ b/client.h
@@ -594,6 +594,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;
 
 // these are updated by CL_ClearState
 extern int cl_num_entities;

diff --git a/menu.c b/menu.c
index 917374f3d773af3e8c5473e12d6ec5415bdbed8c..f86ac6950a374920f2ef347e9f70886e20a2f057 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -1466,7 +1466,7 @@ void M_Options_Key (int k, char ascii)
        }
 }
 
-#define        OPTIONS_EFFECTS_ITEMS   33
+#define        OPTIONS_EFFECTS_ITEMS   34
 
 int options_effects_cursor;
 
@@ -1481,6 +1481,7 @@ void M_Menu_Options_Effects_f (void)
 extern cvar_t r_detailtextures;
 extern cvar_t cl_particles;
 extern cvar_t cl_stainmaps;
+extern cvar_t cl_stainmapsclearonload;
 extern cvar_t cl_decals;
 extern cvar_t r_explosionclip;
 extern cvar_t r_modellights;
@@ -1517,6 +1518,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_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);
@@ -1568,6 +1570,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("                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 309b40e1d40b58acf5a447891811e38b45b6464f..1db17890567d326da500941f07bb6dd278e9d031 100644 (file)
--- a/model_shared.c
+++ b/model_shared.c
@@ -194,6 +194,34 @@ static void mod_shutdown(void)
 
 static void mod_newmap(void)
 {
+       msurface_t *surf;
+       int i, surfnum, ssize, tsize;
+
+       if (!cl_stainmapsclearonload.integer)
+               return;
+
+       for (i=0; i<MAX_MOD_KNOWN; i++)
+       {
+               if (mod_known[i].name[0] && mod_known[i].type == mod_brush)
+               {
+                       for (surfnum=0, surf=mod_known[i].brushq1.surfaces; surfnum<mod_known[i].brushq1.numsurfaces;surfnum++, surf++)
+                       {
+                               if (surf->texinfo->texture->flags & SURF_LIGHTMAP)
+                               {
+                                       ssize = (surf->extents[0] >> 4) + 1;
+                                       tsize = (surf->extents[1] >> 4) + 1;
+                                       
+                                       if (ssize > 256 || tsize > 256)
+                                               Host_Error("Bad surface extents");
+
+                                       if (surf->stainsamples)
+                                               memset(surf->stainsamples, 255, ssize * tsize * 3);
+
+                                       surf->cached_dlight = true;
+                               }
+                       }
+               }
+       }
 }
 
 /*