Don't display VBO options in the menu if the gl_vbo setting doesn't exist in the...

diff --git a/qcsrc/menu/xonotic/dialog_settings_video.qc b/qcsrc/menu/xonotic/dialog_settings_video.qc
index 849fa435bf752c65b603f01556d8b3aa7d044b6f..c43e0af9949c255a8f4f6d521b9add1074511f2f 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_video.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_video.qc
@@ -102,6 +102,8 @@ void XonoticVideoSettingsTab_fill(entity me)
                        e.addValue(e, ZCTX(_("DF^All")), "2");
                        e.configureXonoticTextSliderValues(e);
        me.TR(me);
                        e.addValue(e, ZCTX(_("DF^All")), "2");
                        e.configureXonoticTextSliderValues(e);
        me.TR(me);

+       if(cvar_type("gl_vbo") & CVAR_TYPEFLAG_ENGINE)
+       {

                me.TD(me, 1, 3, e = makeXonoticTextLabel(0, _("Vertex Buffer Objects (VBOs)")));
        me.TR(me);
                me.TDempty(me, 0.2);
                me.TD(me, 1, 3, e = makeXonoticTextLabel(0, _("Vertex Buffer Objects (VBOs)")));
        me.TR(me);
                me.TDempty(me, 0.2);


@@ -114,6 +116,7 @@ void XonoticVideoSettingsTab_fill(entity me)
                        _("Make use of Vertex Buffer Objects to store static geometry in video memory for faster rendering")));
                me.TD(me, 1, 1.9, e = makeXonoticRadioButton_T(1, "gl_vbo", "1", _("Vertices and Triangles"),
                        _("Make use of Vertex Buffer Objects to store static geometry in video memory for faster rendering")));
                        _("Make use of Vertex Buffer Objects to store static geometry in video memory for faster rendering")));
                me.TD(me, 1, 1.9, e = makeXonoticRadioButton_T(1, "gl_vbo", "1", _("Vertices and Triangles"),
                        _("Make use of Vertex Buffer Objects to store static geometry in video memory for faster rendering")));

+       }

 
        me.gotoRC(me, 0, 3.2); me.setFirstColumn(me, me.currentColumn);
                me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Brightness:")));
 
        me.gotoRC(me, 0, 3.2); me.setFirstColumn(me, me.currentColumn);
                me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Brightness:")));

diff --git a/xonotic-client.cfg b/xonotic-client.cfg
index e3e523bd9f2e1ffb0073122c095548edbeffc5ca..cab4d561f2794662e9860b8180d5f68684ffa892 100644 (file)
--- a/xonotic-client.cfg
+++ b/xonotic-client.cfg
@@ -303,6 +303,7 @@ seta cl_projectiles_sloppy 1 "sloppy projectiles, may temporarily penetrate wall
 cl_stainmaps 0
 cl_particles_smoke 1
 set vid_gl20 1
 cl_stainmaps 0
 cl_particles_smoke 1
 set vid_gl20 1

+set gl_vbo 3

 r_glsl_deluxemapping 1
 r_glsl_offsetmapping 0
 r_glsl_offsetmapping_lod 1
 r_glsl_deluxemapping 1
 r_glsl_offsetmapping 0
 r_glsl_offsetmapping_lod 1