From 9e8011ed38aab98f311104212c8c76b339856075 Mon Sep 17 00:00:00 2001
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Thu, 15 Mar 2012 00:43:52 +0200
Subject: [PATCH] Following the Xonotic menu, anisotropy is also a video
 setting, not an effect (which makes sense)

---
 data/effects-high.cfg                           | 1 -
 data/effects-low.cfg                            | 1 -
 data/effects-med.cfg                            | 1 -
 data/effects-normal.cfg                         | 1 -
 data/effects-omg.cfg                            | 1 -
 data/effects-ultimate.cfg                       | 1 -
 data/effects-ultra.cfg                          | 1 -
 data/qcsrc/menu/voret/dialog_settings_effects.c | 9 ---------
 data/qcsrc/menu/voret/dialog_settings_video.c   | 9 +++++++++
 9 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/data/effects-high.cfg b/data/effects-high.cfg
index 31164a5a..0ff80224 100644
--- a/data/effects-high.cfg
+++ b/data/effects-high.cfg
@@ -6,7 +6,6 @@ cl_particles_rain 1
 cl_particles_snow 1
 gl_flashblend 0
 gl_picmip 1
-gl_texture_anisotropy 16
 mod_q3bsp_nolightmaps 0
 r_bloom 1
 r_coronas 1
diff --git a/data/effects-low.cfg b/data/effects-low.cfg
index 160899b2..8462e432 100644
--- a/data/effects-low.cfg
+++ b/data/effects-low.cfg
@@ -6,7 +6,6 @@ cl_particles_rain 0
 cl_particles_snow 0
 gl_flashblend 1
 gl_picmip 2
-gl_texture_anisotropy 1
 mod_q3bsp_nolightmaps 1
 r_bloom 0
 r_coronas 1
diff --git a/data/effects-med.cfg b/data/effects-med.cfg
index 4c72d37e..2ce16765 100644
--- a/data/effects-med.cfg
+++ b/data/effects-med.cfg
@@ -6,7 +6,6 @@ cl_particles_rain 1
 cl_particles_snow 1
 gl_flashblend 0
 gl_picmip 1
-gl_texture_anisotropy 1
 mod_q3bsp_nolightmaps 0
 r_bloom 0
 r_coronas 1
diff --git a/data/effects-normal.cfg b/data/effects-normal.cfg
index 38428c77..21040536 100644
--- a/data/effects-normal.cfg
+++ b/data/effects-normal.cfg
@@ -6,7 +6,6 @@ cl_particles_rain 1
 cl_particles_snow 1
 gl_flashblend 0
 gl_picmip 1
-gl_texture_anisotropy 1
 mod_q3bsp_nolightmaps 0
 r_bloom 0
 r_coronas 1
diff --git a/data/effects-omg.cfg b/data/effects-omg.cfg
index 7cf611cf..119102e9 100644
--- a/data/effects-omg.cfg
+++ b/data/effects-omg.cfg
@@ -6,7 +6,6 @@ cl_particles_rain 0
 cl_particles_snow 0
 gl_flashblend 1
 gl_picmip 1337
-gl_texture_anisotropy 1
 mod_q3bsp_nolightmaps 1
 r_bloom 0
 r_coronas 1
diff --git a/data/effects-ultimate.cfg b/data/effects-ultimate.cfg
index 6181467b..d87f341e 100644
--- a/data/effects-ultimate.cfg
+++ b/data/effects-ultimate.cfg
@@ -6,7 +6,6 @@ cl_particles_rain 1
 cl_particles_snow 1
 gl_flashblend 0
 gl_picmip 0
-gl_texture_anisotropy 16
 mod_q3bsp_nolightmaps 0
 r_bloom 1
 r_coronas 1
diff --git a/data/effects-ultra.cfg b/data/effects-ultra.cfg
index f5c0177f..9e06bd9d 100644
--- a/data/effects-ultra.cfg
+++ b/data/effects-ultra.cfg
@@ -6,7 +6,6 @@ cl_particles_rain 1
 cl_particles_snow 1
 gl_flashblend 0
 gl_picmip 0
-gl_texture_anisotropy 16
 mod_q3bsp_nolightmaps 0
 r_bloom 1
 r_coronas 1
diff --git a/data/qcsrc/menu/voret/dialog_settings_effects.c b/data/qcsrc/menu/voret/dialog_settings_effects.c
index ba2fc385..80d93ce5 100644
--- a/data/qcsrc/menu/voret/dialog_settings_effects.c
+++ b/data/qcsrc/menu/voret/dialog_settings_effects.c
@@ -74,15 +74,6 @@ void fillVoretEffectsSettingsTab(entity me)
 		me.TD(me, 1, 2.8, e = makeVoretCheckBox(1, "r_picmipworld", "Reduce model texture quality only"));
 			setDependent(e, "gl_picmip", 0.5, -0.5);
 	me.TR(me);
-	me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Anisotropy:"));
-		me.TD(me, 1, 2, e = makeVoretTextSlider("gl_texture_anisotropy"));
-			e.addValue(e, "Disabled", "1");
-			e.addValue(e, "2x", "2");
-			e.addValue(e, "4x", "4");
-			e.addValue(e, "8x", "8");
-			e.addValue(e, "16x", "16");
-			e.configureVoretTextSliderValues(e);
-	me.TR(me);
 	me.TR(me);
 		me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Particle quality:"));
 		me.TD(me, 1, 2, e = makeVoretSlider(0.1, 1.0, 0.05, "cl_particles_quality"));
diff --git a/data/qcsrc/menu/voret/dialog_settings_video.c b/data/qcsrc/menu/voret/dialog_settings_video.c
index 4a0a59d6..8e7437fe 100644
--- a/data/qcsrc/menu/voret/dialog_settings_video.c
+++ b/data/qcsrc/menu/voret/dialog_settings_video.c
@@ -50,6 +50,15 @@ void fillVoretVideoSettingsTab(entity me)
 		me.TD(me, 1, 1, e = makeVoretCheckBox(0, "vid_fullscreen", "Full screen"));
 		me.TD(me, 1, 2, e = makeVoretCheckBox(0, "vid_vsync", "Vertical Synchronization"));
 	me.TR(me);
+	me.TR(me);
+	me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Anisotropy:"));
+		me.TD(me, 1, 2, e = makeVoretTextSlider("gl_texture_anisotropy"));
+			e.addValue(e, "Disabled", "1");
+			e.addValue(e, "2x", "2");
+			e.addValue(e, "4x", "4");
+			e.addValue(e, "8x", "8");
+			e.addValue(e, "16x", "16");
+			e.configureVoretTextSliderValues(e);
 	me.TR(me);
 		me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Antialiasing:"));
 		me.TD(me, 1, 2, e = makeVoretTextSlider("vid_samples"));
-- 
2.39.2