add cvar cl_movement_track_canjump (when off, client prediction allows "pogoing"...

[xonotic/darkplaces.git] / menu.c

diff --git a/menu.c b/menu.c
index aa2d6e346bc97a7198028990352c7350e53f0684..fe931e6edc34c08d405cba74842080863541c295 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -1560,7 +1560,7 @@ static void M_DrawCheckbox (int x, int y, int on)
 
 
 //#define OPTIONS_ITEMS 25 aule was here
-#define OPTIONS_ITEMS 26
+#define OPTIONS_ITEMS 27
 
 
 static int options_cursor;
@@ -1593,6 +1593,19 @@ static void M_Menu_Options_AdjustSliders (int dir)
        else if (options_cursor == optnum++) Cvar_SetValueQuick(&sensitivity, bound(1, sensitivity.value + dir * 0.5, 50));
        else if (options_cursor == optnum++) Cvar_SetValueQuick(&m_pitch, -m_pitch.value);
        else if (options_cursor == optnum++) Cvar_SetValueQuick(&scr_fov, bound(1, scr_fov.integer + dir * 1, 170));
+       else if (options_cursor == optnum++)
+       {
+               if (cl_forwardspeed.value > 200)
+               {
+                       Cvar_SetValueQuick (&cl_forwardspeed, 200);
+                       Cvar_SetValueQuick (&cl_backspeed, 200);
+               }
+               else
+               {
+                       Cvar_SetValueQuick (&cl_forwardspeed, 400);
+                       Cvar_SetValueQuick (&cl_backspeed, 400);
+               }
+       }
        else if (options_cursor == optnum++) Cvar_SetValueQuick(&showfps, !showfps.integer);
        else if (options_cursor == optnum++) {f = !(showdate.integer && showtime.integer);Cvar_SetValueQuick(&showdate, f);Cvar_SetValueQuick(&showtime, f);}
        else if (options_cursor == optnum++) ;
@@ -1669,6 +1682,7 @@ static void M_Options_Draw (void)
        M_Options_PrintSlider(  "           Mouse Speed", true, sensitivity.value, 1, 50);
        M_Options_PrintCheckbox("          Invert Mouse", true, m_pitch.value < 0);
        M_Options_PrintSlider(  "         Field of View", true, scr_fov.integer, 1, 170);
+       M_Options_PrintCheckbox("            Always Run", true, cl_forwardspeed.value > 200);
        M_Options_PrintCheckbox("        Show Framerate", true, showfps.integer);
        M_Options_PrintCheckbox("    Show Date and Time", true, showdate.integer && showtime.integer);
        M_Options_PrintCommand( "     Custom Brightness", true);
@@ -1716,37 +1730,37 @@ static void M_Options_Key (int k, char ascii)
                case 3:
                        M_Menu_Video_f ();
                        break;
-               case 10:
+               case 11:
                        M_Menu_Options_ColorControl_f ();
                        break;
-               case 16: // Customize Effects
+               case 17: // Customize Effects
                        M_Menu_Options_Effects_f ();
                        break;
-               case 17: // Effects: Quake
+               case 18: // Effects: Quake
                        Cbuf_AddText("cl_particles 1;cl_particles_quake 1;cl_particles_quality 1;cl_particles_explosions_shell 0;r_explosionclip 1;cl_stainmaps 0;cl_stainmaps_clearonload 1;cl_decals 0;cl_particles_bulletimpacts 1;cl_particles_smoke 1;cl_particles_sparks 1;cl_particles_bubbles 1;cl_particles_blood 1;cl_particles_blood_alpha 1;cl_particles_blood_bloodhack 0;cl_beams_polygons 0;cl_beams_instantaimhack 0;cl_beams_quakepositionhack 1;cl_beams_lightatend 0;r_lerpmodels 1;r_lerpsprites 1;gl_polyblend 1;r_skyscroll1 1;r_skyscroll2 2;r_waterwarp 1;r_wateralpha 1;r_waterscroll 1\n");
                        break;
-               case 18: // Effects: Normal
+               case 19: // Effects: Normal
                        Cbuf_AddText("cl_particles 1;cl_particles_quake 0;cl_particles_quality 1;cl_particles_explosions_shell 0;r_explosionclip 1;cl_stainmaps 0;cl_stainmaps_clearonload 1;cl_decals 1;cl_particles_bulletimpacts 1;cl_particles_smoke 1;cl_particles_sparks 1;cl_particles_bubbles 1;cl_particles_blood 1;cl_particles_blood_alpha 1;cl_particles_blood_bloodhack 1;cl_beams_polygons 1;cl_beams_instantaimhack 0;cl_beams_quakepositionhack 1;cl_beams_lightatend 0;r_lerpmodels 1;r_lerpsprites 1;gl_polyblend 1;r_skyscroll1 1;r_skyscroll2 2;r_waterwarp 1;r_wateralpha 1;r_waterscroll 1\n");
                        break;
-               case 19: // Effects: High
+               case 20: // Effects: High
                        Cbuf_AddText("cl_particles 1;cl_particles_quake 0;cl_particles_quality 2;cl_particles_explosions_shell 0;r_explosionclip 1;cl_stainmaps 1;cl_stainmaps_clearonload 1;cl_decals 1;cl_particles_bulletimpacts 1;cl_particles_smoke 1;cl_particles_sparks 1;cl_particles_bubbles 1;cl_particles_blood 1;cl_particles_blood_alpha 1;cl_particles_blood_bloodhack 1;cl_beams_polygons 1;cl_beams_instantaimhack 0;cl_beams_quakepositionhack 1;cl_beams_lightatend 0;r_lerpmodels 1;r_lerpsprites 1;gl_polyblend 1;r_skyscroll1 1;r_skyscroll2 2;r_waterwarp 1;r_wateralpha 1;r_waterscroll 1\n");
                        break;
-               case 20:
+               case 21:
                        M_Menu_Options_Graphics_f ();
                        break;
-               case 21: // Lighting: Flares
+               case 22: // Lighting: Flares
                        Cbuf_AddText("r_coronas 1;gl_flashblend 1;r_shadow_gloss 0;r_shadow_realtime_dlight 0;r_shadow_realtime_dlight_shadows 0;r_shadow_realtime_world 0;r_shadow_realtime_world_lightmaps 0;r_shadow_realtime_world_shadows 1;r_bloom 0;r_hdr 0");
                        break;
-               case 22: // Lighting: Normal
+               case 23: // Lighting: Normal
                        Cbuf_AddText("r_coronas 1;gl_flashblend 0;r_shadow_gloss 1;r_shadow_realtime_dlight 1;r_shadow_realtime_dlight_shadows 0;r_shadow_realtime_world 0;r_shadow_realtime_world_lightmaps 0;r_shadow_realtime_world_shadows 1;r_bloom 0;r_hdr 0");
                        break;
-               case 23: // Lighting: High
+               case 24: // Lighting: High
                        Cbuf_AddText("r_coronas 1;gl_flashblend 0;r_shadow_gloss 1;r_shadow_realtime_dlight 1;r_shadow_realtime_dlight_shadows 1;r_shadow_realtime_world 0;r_shadow_realtime_world_lightmaps 0;r_shadow_realtime_world_shadows 1;r_bloom 1;r_hdr 0");
                        break;
-               case 24: // Lighting: Full
+               case 25: // Lighting: Full
                        Cbuf_AddText("r_coronas 1;gl_flashblend 0;r_shadow_gloss 1;r_shadow_realtime_dlight 1;r_shadow_realtime_dlight_shadows 1;r_shadow_realtime_world 1;r_shadow_realtime_world_lightmaps 0;r_shadow_realtime_world_shadows 1;r_bloom 1;r_hdr 0");
                        break;
-               case 25:
+               case 26:
                        M_Menu_ModList_f ();
                        break;
                default: