cl_fakelocalping cvars now produce the specified ping time (rather than twice it...

[xonotic/darkplaces.git] / menu.c

diff --git a/menu.c b/menu.c
index 581724d811fb915bea19e59540da4c2afb735fb9..4c772eceb40f74f52fd506e8f5ee99d4e5b876a4 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -1398,50 +1398,28 @@ void M_Menu_Options_Effects_AdjustSliders (int dir)
        S_LocalSound ("misc/menu3.wav");
 
        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_coronas, !r_coronas.integer);
-       else if (options_effects_cursor == optnum++)
-               Cvar_SetValueQuick (&gl_flashblend, !gl_flashblend.integer);
-       else if (options_effects_cursor == optnum++)
-               Cvar_SetValueQuick (&cl_particles, !cl_particles.integer);
-       else if (options_effects_cursor == optnum++)
-               Cvar_SetValueQuick (&cl_particles_quality, bound(1, cl_particles_quality.value + dir * 0.5, 4));
-       else if (options_effects_cursor == optnum++)
-               Cvar_SetValueQuick (&cl_explosions, !cl_explosions.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_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);
-       else if (options_effects_cursor == optnum++)
-               Cvar_SetValueQuick (&cl_particles_smoke, !cl_particles_smoke.integer);
-       else if (options_effects_cursor == optnum++)
-               Cvar_SetValueQuick (&cl_particles_sparks, !cl_particles_sparks.integer);
-       else if (options_effects_cursor == optnum++)
-               Cvar_SetValueQuick (&cl_particles_bubbles, !cl_particles_bubbles.integer);
-       else if (options_effects_cursor == optnum++)
-               Cvar_SetValueQuick (&cl_particles_blood, !cl_particles_blood.integer);
-       else if (options_effects_cursor == optnum++)
-               Cvar_SetValueQuick (&cl_particles_blood_alpha, bound(0.2, cl_particles_blood_alpha.value + dir * 0.1, 1));
-       else if (options_effects_cursor == optnum++)
-               Cvar_SetValueQuick (&cl_particles_blood_bloodhack, !cl_particles_blood_bloodhack.integer);
-       else if (options_effects_cursor == optnum++)
-               Cvar_SetValueQuick (&r_lerpmodels, !r_lerpmodels.integer);
-       else if (options_effects_cursor == optnum++)
-               Cvar_SetValueQuick (&r_lerpsprites, !r_lerpsprites.integer);
-       else if (options_effects_cursor == optnum++)
-               Cvar_SetValueQuick (&r_wateralpha, bound(0, r_wateralpha.value + dir * 0.1, 1));
-       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, bound(0, r_watershader.value + dir * 0.25, 10));
+            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_coronas, bound(0, r_coronas.value + dir * 0.125, 4));
+       else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&gl_flashblend, !gl_flashblend.integer);
+       else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles, !cl_particles.integer);
+       else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_quality, bound(1, cl_particles_quality.value + dir * 0.5, 4));
+       else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_explosions, !cl_explosions.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_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);
+       else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_smoke, !cl_particles_smoke.integer);
+       else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_sparks, !cl_particles_sparks.integer);
+       else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_bubbles, !cl_particles_bubbles.integer);
+       else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_blood, !cl_particles_blood.integer);
+       else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_blood_alpha, bound(0.2, cl_particles_blood_alpha.value + dir * 0.1, 1));
+       else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_blood_bloodhack, !cl_particles_blood_bloodhack.integer);
+       else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_lerpmodels, !r_lerpmodels.integer);
+       else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_lerpsprites, !r_lerpsprites.integer);
+       else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_wateralpha, bound(0, r_wateralpha.value + dir * 0.1, 1));
+       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, bound(0, r_watershader.value + dir * 0.25, 10));
 }
 
 void M_Options_Effects_Draw (void)
@@ -1461,7 +1439,7 @@ 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("               Coronas", true, r_coronas.integer);
+       M_Options_PrintSlider(  "      Corona Intensity", true, r_coronas.value, 0, 4);
        M_Options_PrintCheckbox("      Use Only Coronas", true, gl_flashblend.integer);
        M_Options_PrintCheckbox("             Particles", true, cl_particles.integer);
        M_Options_PrintSlider(  "     Particles Quality", true, cl_particles_quality.value, 1, 4);
@@ -1740,7 +1718,6 @@ void M_Options_ColorControl_Key (int k, char ascii)
                        Cvar_SetValueQuick(&v_color_white_r, 1);
                        Cvar_SetValueQuick(&v_color_white_g, 1);
                        Cvar_SetValueQuick(&v_color_white_b, 1);
-                       Cbuf_AddText ("exec default.cfg\n");
                        break;
                default:
                        M_Menu_Options_ColorControl_AdjustSliders (1);
@@ -1988,7 +1965,7 @@ void M_FindKeysForCommand (char *command, int *keys)
 
        for (j=0 ; j<256 ; j++)
        {
-               b = keybindings[j];
+               b = keybindings[0][j];
                if (!b)
                        continue;
                if (!strcmp (b, command) )
@@ -2007,11 +1984,11 @@ void M_UnbindCommand (char *command)
 
        for (j=0 ; j<256 ; j++)
        {
-               b = keybindings[j];
+               b = keybindings[0][j];
                if (!b)
                        continue;
                if (!strcmp (b, command))
-                       Key_SetBinding (j, "");
+                       Key_SetBinding (j, 0, "");
        }
 }
 
@@ -2235,7 +2212,7 @@ void M_Menu_Video_AdjustSliders (int dir)
                        int new_resolution = video_resolution + dir;
                        if (gamemode == GAME_FNIGGIUM ? new_resolution < VID_640 : new_resolution < 0)
                                video_resolution = VID_RES_COUNT - 1;
-                       else if (new_resolution > VID_RES_COUNT)
+                       else if (new_resolution > VID_RES_COUNT - 1)
                                video_resolution = gamemode == GAME_FNIGGIUM ? VID_640 : 0;
                        else
                                video_resolution = new_resolution;