Include some sane options in the cl_maxfps slider and increase the default to 250

diff --git a/qcsrc/menu/xonotic/dialog_settings_misc.qc b/qcsrc/menu/xonotic/dialog_settings_misc.qc
index 75e6e13f59be7e78752361eef7670ca1694f36d2..ca812d30415bd23c46802c36c0359cc41e0e3bd2 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_misc.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_misc.qc
@@ -87,15 +87,13 @@ void XonoticMiscSettingsTab_fill(entity me)
                me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Maximum:")));
                me.TD(me, 1, 2, e = makeXonoticTextSlider("cl_maxfps"));
                        ADDVALUE_FPS(30);
                me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Maximum:")));
                me.TD(me, 1, 2, e = makeXonoticTextSlider("cl_maxfps"));
                        ADDVALUE_FPS(30);

-                       ADDVALUE_FPS(40);
-                       ADDVALUE_FPS(50);

                        ADDVALUE_FPS(60);
                        ADDVALUE_FPS(60);

-                       ADDVALUE_FPS(70);
-                       ADDVALUE_FPS(80);

                        ADDVALUE_FPS(100);
                        ADDVALUE_FPS(125);
                        ADDVALUE_FPS(150);
                        ADDVALUE_FPS(200);
                        ADDVALUE_FPS(100);
                        ADDVALUE_FPS(125);
                        ADDVALUE_FPS(150);
                        ADDVALUE_FPS(200);

+                       ADDVALUE_FPS(250);
+                       ADDVALUE_FPS(400);

                        e.addValue(e, ZCTX(_("MAXFPS^Unlimited")), "0");
                        e.configureXonoticTextSliderValues(e);
        me.TR(me);
                        e.addValue(e, ZCTX(_("MAXFPS^Unlimited")), "0");
                        e.configureXonoticTextSliderValues(e);
        me.TR(me);


@@ -103,14 +101,13 @@ void XonoticMiscSettingsTab_fill(entity me)
                me.TD(me, 1, 2, e = makeXonoticTextSlider("cl_minfps"));
                        e.addValue(e, ZCTX(_("TRGT^Disabled")), "0");
                        ADDVALUE_FPS(30);
                me.TD(me, 1, 2, e = makeXonoticTextSlider("cl_minfps"));
                        e.addValue(e, ZCTX(_("TRGT^Disabled")), "0");
                        ADDVALUE_FPS(30);

-                       ADDVALUE_FPS(40);
-                       ADDVALUE_FPS(50);

                        ADDVALUE_FPS(60);
                        ADDVALUE_FPS(60);

-                       ADDVALUE_FPS(80);

                        ADDVALUE_FPS(100);
                        ADDVALUE_FPS(125);
                        ADDVALUE_FPS(150);
                        ADDVALUE_FPS(200);
                        ADDVALUE_FPS(100);
                        ADDVALUE_FPS(125);
                        ADDVALUE_FPS(150);
                        ADDVALUE_FPS(200);

+                       ADDVALUE_FPS(250);
+                       ADDVALUE_FPS(400);

                        e.configureXonoticTextSliderValues(e);
        me.TR(me);
                me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Idle limit:")));
                        e.configureXonoticTextSliderValues(e);
        me.TR(me);
                me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Idle limit:")));

diff --git a/xonotic-client.cfg b/xonotic-client.cfg
index 6ee12fd5d6337f6f34511f5a6ef72b88427c43ed..e9120cac6b8d0e87c9036fa2b86fbfc23c42d5c6 100644 (file)
--- a/xonotic-client.cfg
+++ b/xonotic-client.cfg
@@ -622,7 +622,7 @@ gl_texturecompression_lightcubemaps 0
 gl_texturecompression_q3bsplightmaps 0
 gl_texturecompression_sky 1
 
 gl_texturecompression_q3bsplightmaps 0
 gl_texturecompression_sky 1
 

-cl_maxfps 200
+cl_maxfps 250

 
 seta menu_mouse_absolute 1 "use the OS mouse pointer motion for menu"
 seta menu_mouse_speed 1 "speed multiplier for the mouse in the menu (does not affect in-game aiming)"
 
 seta menu_mouse_absolute 1 "use the OS mouse pointer motion for menu"
 seta menu_mouse_speed 1 "speed multiplier for the mouse in the menu (does not affect in-game aiming)"