r_dlightmap 0 mode removed (vertex dlights on lightmapped walls)

[xonotic/darkplaces.git] / menu.c

diff --git a/menu.c b/menu.c
index 044dcf8fa02265452b3ec2ad6399764f29956d5b..eb9165994c2a57dcd372b99f5056801384c0e5fc 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -1111,7 +1111,7 @@ void M_DrawCheckbox (int x, int y, int on)
 }
 
 
-#define OPTIONS_ITEMS 33
+#define OPTIONS_ITEMS 32
 
 int options_cursor;
 
@@ -1149,8 +1149,6 @@ void M_Menu_Options_AdjustSliders (int dir)
                Cvar_SetValueQuick (&scr_screenshot_jpeg, !scr_screenshot_jpeg.integer);
        else if (options_cursor == optnum++)
                Cvar_SetValueQuick (&r_sky, !r_sky.integer);
-       else if (options_cursor == optnum++)
-               Cvar_SetValueQuick (&v_overbrightbits, bound(0, v_overbrightbits.integer + dir, 4));
        else if (options_cursor == optnum++)
                Cvar_SetValueQuick (&gl_combine, !gl_combine.integer);
        else if (options_cursor == optnum++)
@@ -1275,7 +1273,6 @@ void M_Options_Draw (void)
        M_Options_PrintSlider(  "       Screen size", true, scr_viewsize.value, 30, 120);
        M_Options_PrintCheckbox("  JPEG screenshots", jpeg_dll != NULL, scr_screenshot_jpeg.integer);
        M_Options_PrintCheckbox("               Sky", true, r_sky.integer);
-       M_Options_PrintSlider(  "   Overbright Bits", true, v_overbrightbits.value, 0, 4);
        M_Options_PrintCheckbox("   Texture Combine", true, gl_combine.integer);
        M_Options_PrintCheckbox("         Dithering", true, gl_dither.integer);
        M_Options_PrintCheckbox("Delay gfx (faster)", true, gl_delayfinish.integer);
@@ -1377,7 +1374,6 @@ extern cvar_t cl_explosions;
 extern cvar_t cl_stainmaps;
 extern cvar_t cl_decals;
 extern cvar_t r_explosionclip;
-extern cvar_t r_dlightmap;
 extern cvar_t r_modellights;
 extern cvar_t r_coronas;
 extern cvar_t gl_flashblend;
@@ -1397,8 +1393,6 @@ void M_Menu_Options_Effects_AdjustSliders (int dir)
        optnum = 0;
        if (options_effects_cursor == optnum++)
                Cvar_SetValueQuick (&r_modellights, bound(0, r_modellights.value + dir, 8));
-       else if (options_effects_cursor == optnum++)
-               Cvar_SetValueQuick (&r_dlightmap, !r_dlightmap.integer);
        else if (options_effects_cursor == optnum++)
                Cvar_SetValueQuick (&r_coronas, !r_coronas.integer);
        else if (options_effects_cursor == optnum++)
@@ -1435,6 +1429,8 @@ void M_Menu_Options_Effects_AdjustSliders (int dir)
                Cvar_SetValueQuick (&r_lerpsprites, !r_lerpsprites.integer);
        else if (options_effects_cursor == optnum++)
                Cvar_SetValueQuick (&r_waterscroll, bound(0, r_waterscroll.value + dir * 0.5, 10));
+       else if (options_effects_cursor == optnum++)
+               Cvar_SetValueQuick (&r_watershader, !r_watershader.integer);
 }
 
 void M_Options_Effects_Draw (void)
@@ -1454,7 +1450,6 @@ void M_Options_Effects_Draw (void)
        opty = 32 - bound(0, optcursor - (visible >> 1), max(0, OPTIONS_EFFECTS_ITEMS - visible)) * 8;
 
        M_Options_PrintSlider(  "      Lights Per Model", true, r_modellights.value, 0, 8);
-       M_Options_PrintCheckbox(" Fast Dynamic Lighting", true, !r_dlightmap.integer);
        M_Options_PrintCheckbox("               Coronas", true, r_coronas.integer);
        M_Options_PrintCheckbox("      Use Only Coronas", true, gl_flashblend.integer);
        M_Options_PrintCheckbox("             Particles", true, cl_particles.integer);
@@ -1473,6 +1468,7 @@ void M_Options_Effects_Draw (void)
        M_Options_PrintCheckbox("   Model Interpolation", true, r_lerpmodels.integer);
        M_Options_PrintCheckbox("  Sprite Interpolation", true, r_lerpsprites.integer);
        M_Options_PrintSlider(  "        Water Movement", true, r_waterscroll.value, 0, 10);
+       M_Options_PrintCheckbox(" GeForce3 Water Shader", true, r_watershader.integer);
 }