From: Mario <mario.mario@y7mail.com>
Date: Wed, 15 Jul 2020 15:10:35 +0000 (+1000)
Subject: Don't display GLSL shaders option in the menu if the vid_gl20 doesn't exist in the... 
X-Git-Tag: xonotic-v0.8.5~868
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8902733275bfdde8518216069bbe7d3e29812756;p=xonotic%2Fxonotic-data.pk3dir.git

Don't display GLSL shaders option in the menu if the vid_gl20 doesn't exist in the engine
---

diff --git a/qcsrc/menu/xonotic/dialog_settings_video.qc b/qcsrc/menu/xonotic/dialog_settings_video.qc
index 77f2602a1..849fa435b 100644
--- a/qcsrc/menu/xonotic/dialog_settings_video.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_video.qc
@@ -155,8 +155,11 @@ void XonoticVideoSettingsTab_fill(entity me)
 		me.TD(me, 1, 3, e = makeXonoticCheckBox_T(0, "gl_finish", _("Wait for GPU to finish each frame"),
 			_("Make the CPU wait for the GPU to finish each frame, can help with some strange input or video lag on some machines")));
 	me.TR(me);
+	if(cvar_type("vid_gl20") & CVAR_TYPEFLAG_ENGINE)
+	{
 		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "vid_gl20", _("Use OpenGL 2.0 shaders (GLSL)")));
 			e.applyButton = videoApplyButton;
+	}
 	if(cvar("developer") > 0)
 	{
 		me.TR(me);
diff --git a/xonotic-client.cfg b/xonotic-client.cfg
index 90d4bdbf4..e3e523bd9 100644
--- a/xonotic-client.cfg
+++ b/xonotic-client.cfg
@@ -302,7 +302,7 @@ seta cl_casings_sloppy 1 "sloppy casings, may temporarily penetrate walls"
 seta cl_projectiles_sloppy 1 "sloppy projectiles, may temporarily penetrate walls"
 cl_stainmaps 0
 cl_particles_smoke 1
-vid_gl20 1
+set vid_gl20 1
 r_glsl_deluxemapping 1
 r_glsl_offsetmapping 0
 r_glsl_offsetmapping_lod 1