From: Rudolf Polzer <divverent@alientrap.org>
Date: Sat, 22 Jan 2011 09:17:19 +0000 (+0100)
Subject: more rearranging
X-Git-Tag: xonotic-v0.5.0~316^2~27
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=c53d33ac8f2c46d41b4e7fb8064df7e02e8622f7;ds=sidebyside

more rearranging
---

diff --git a/qcsrc/menu/xonotic/dialog_settings_effects.c b/qcsrc/menu/xonotic/dialog_settings_effects.c
index ec8329b5d8..072411241a 100644
--- a/qcsrc/menu/xonotic/dialog_settings_effects.c
+++ b/qcsrc/menu/xonotic/dialog_settings_effects.c
@@ -171,6 +171,7 @@ void XonoticEffectsSettingsTab_fill(entity me)
 			setDependentWeird(e, someShadowCvarIsEnabled);
 	me.TR(me);
 		me.TD(me, 1, 1, e = makeXonoticCheckBox(0, "r_coronas", _("Coronas")));
+		me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "r_coronas_occlusionquery", _("Use Occlusion Queries")));
 	me.TR(me);
 		me.TD(me, 1, 1.2, e = makeXonoticCheckBox(0, "r_bloom", _("Bloom")));
 			setDependent(e, "r_hdr", 0, 0);
diff --git a/qcsrc/menu/xonotic/dialog_settings_video.c b/qcsrc/menu/xonotic/dialog_settings_video.c
index 951e816086..38b236b62b 100644
--- a/qcsrc/menu/xonotic/dialog_settings_video.c
+++ b/qcsrc/menu/xonotic/dialog_settings_video.c
@@ -48,8 +48,9 @@ void XonoticVideoSettingsTab_fill(entity me)
 	me.TR(me);
 		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "vid_gl20", _("Use OpenGL 2.0 shaders (GLSL)")));
 	me.TR(me);
-	me.TR(me);
-		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "r_coronas_occlusionquery", _("Use Occlusion Queries")));
+		me.TDempty(me, 0.2);
+		me.TD(me, 1, 2.8, e = makeXonoticCheckBox(0, "v_glslgamma", _("Use GLSL to handle color control")));
+			setDependent(e, "vid_gl20", 1, 1);
 	me.TR(me);
 	me.TR(me);
 		me.TD(me, 1, 3, e = makeXonoticTextLabel(0, _("Vertex Buffer Objects (VBOs)")));
@@ -61,6 +62,7 @@ void XonoticVideoSettingsTab_fill(entity me)
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 0.9, e = makeXonoticRadioButton(1, "gl_vbo", "2", _("Vertices")));
 		me.TD(me, 1, 1.9, e = makeXonoticRadioButton(1, "gl_vbo", "1", _("Vertices and Triangles")));
+	me.TR(me);
 	me.TR(me);
 		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Depth first:")));
 		me.TD(me, 1, 2, e = makeXonoticTextSlider("r_depthfirst"));
@@ -91,9 +93,6 @@ void XonoticVideoSettingsTab_fill(entity me)
 			setDependent(e, "vid_gl20", 1, 1);
 		me.TD(me, 1, 2, e = makeXonoticSlider(0.5, 2.0, 0.05, "r_glsl_saturation"));
 			setDependent(e, "vid_gl20", 1, 1);
-	me.TR(me);
-		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "v_glslgamma", _("Use GLSL to handle color control")));
-			setDependent(e, "vid_gl20", 1, 1);
 	me.TR(me);
 	me.TR(me);
 		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, ZCTX(_("LIT^Ambient:"))));