From: Rudolf Polzer <divVerent@gmail.com>
Date: Fri, 12 Jul 2024 15:40:40 +0000 (-0700)
Subject: Settings: migrate from r_water to r_water_cameraentitiesonly.
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F1299%2Fhead;p=xonotic%2Fxonotic-data.pk3dir.git

Settings: migrate from r_water to r_water_cameraentitiesonly.

Makes sure that maps with warpzones don't suddenly turn on water
reflections too.
---

diff --git a/config_update.cfg b/config_update.cfg
index a99803136..38f298b58 100644
--- a/config_update.cfg
+++ b/config_update.cfg
@@ -20,8 +20,11 @@ alias _update_configversion_5 "r_shadow_realtime_world_lightmaps 1; _update_conf
 alias _update_configversion_6 "r_font_disable_freetype 0; utf8_enable 1; _update_configversion_7"
 
 // place to put further updates
-alias _update_configversion_7 ""
+alias _update_configversion_7 "r_water 1; _update_configversion_8"
+
+// place to put further updates
+alias _update_configversion_8 ""
 
 _update_configversion_$g_configversion
 
-set g_configversion 7
+set g_configversion 8
diff --git a/effects-high.cfg b/effects-high.cfg
index 508f5100c..0e551be0f 100644
--- a/effects-high.cfg
+++ b/effects-high.cfg
@@ -35,7 +35,7 @@ r_showsurfaces 0
 r_sky 1
 r_subdivisions_tolerance 3
 r_texture_dds_load 1
-r_water 1
+r_water_cameraentitiesonly 0
 r_water_resolutionmultiplier 0.25
 
 menu_sync
diff --git a/effects-low.cfg b/effects-low.cfg
index bbcc816a2..db04f3163 100644
--- a/effects-low.cfg
+++ b/effects-low.cfg
@@ -35,7 +35,7 @@ r_showsurfaces 0
 r_sky 1
 r_subdivisions_tolerance 8
 r_texture_dds_load 1
-r_water 0
+r_water_cameraentitiesonly 1
 r_water_resolutionmultiplier 0.25
 
 menu_sync
diff --git a/effects-med.cfg b/effects-med.cfg
index a2d8ba7a5..e1cffec3a 100644
--- a/effects-med.cfg
+++ b/effects-med.cfg
@@ -35,7 +35,7 @@ r_showsurfaces 0
 r_sky 1
 r_subdivisions_tolerance 4
 r_texture_dds_load 1
-r_water 0
+r_water_cameraentitiesonly 1
 r_water_resolutionmultiplier 0.25
 
 menu_sync
diff --git a/effects-normal.cfg b/effects-normal.cfg
index 795492dad..1b607ad9f 100644
--- a/effects-normal.cfg
+++ b/effects-normal.cfg
@@ -35,7 +35,7 @@ r_showsurfaces 0
 r_sky 1
 r_subdivisions_tolerance 3
 r_texture_dds_load 1
-r_water 0
+r_water_cameraentitiesonly 1
 r_water_resolutionmultiplier 0.25
 
 menu_sync
diff --git a/effects-omg.cfg b/effects-omg.cfg
index e90282f43..6a2ad31c0 100644
--- a/effects-omg.cfg
+++ b/effects-omg.cfg
@@ -35,7 +35,7 @@ r_showsurfaces 3
 r_sky 0
 r_subdivisions_tolerance 16
 r_texture_dds_load 1
-r_water 0
+r_water_cameraentitiesonly 1
 r_water_resolutionmultiplier 0.25
 
 menu_sync
diff --git a/effects-ultimate.cfg b/effects-ultimate.cfg
index d887691ee..2368ca723 100644
--- a/effects-ultimate.cfg
+++ b/effects-ultimate.cfg
@@ -35,7 +35,7 @@ r_showsurfaces 0
 r_sky 1
 r_subdivisions_tolerance 1
 r_texture_dds_load 0
-r_water 1
+r_water_cameraentitiesonly 0
 r_water_resolutionmultiplier 1
 
 menu_sync
diff --git a/effects-ultra.cfg b/effects-ultra.cfg
index 2e66c0da1..7f471186e 100644
--- a/effects-ultra.cfg
+++ b/effects-ultra.cfg
@@ -35,7 +35,7 @@ r_showsurfaces 0
 r_sky 1
 r_subdivisions_tolerance 2
 r_texture_dds_load 0
-r_water 1
+r_water_cameraentitiesonly 0
 r_water_resolutionmultiplier 0.5
 
 menu_sync
diff --git a/qcsrc/menu/xonotic/dialog_settings_effects.qc b/qcsrc/menu/xonotic/dialog_settings_effects.qc
index 1a08a42bd..0aafeb699 100644
--- a/qcsrc/menu/xonotic/dialog_settings_effects.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_effects.qc
@@ -150,7 +150,7 @@ void XonoticEffectsSettingsTab_fill(entity me)
 			_("Higher quality offset mapping, which also has a huge impact on performance")));
 			setDependentAND(e, "vid_gl20", 1, 1, "r_glsl_offsetmapping", 1, 1);
 	me.TR(me);
-		me.TD(me, 1, 1, e = makeXonoticCheckBox_T(0, "r_water", _("Reflections:"),
+		me.TD(me, 1, 1, e = makeXonoticCheckBox_T(1, "r_water_cameraentitiesonly", _("Reflections:"),
 			_("Reflection and refraction quality, has a huge impact on performance on maps with reflecting surfaces")));
 			setDependent(e, "vid_gl20", 1, 1);
 		me.TD(me, 1, 2, e = makeXonoticTextSlider_T("r_water_resolutionmultiplier",
@@ -159,7 +159,7 @@ void XonoticEffectsSettingsTab_fill(entity me)
 			e.addValue(e, ZCTX(_("REFL^Good")), "0.5");
 			e.addValue(e, _("Sharp"), "1");
 			e.configureXonoticTextSliderValues(e);
-			setDependentAND(e, "vid_gl20", 1, 1, "r_water", 1, 1);
+			setDependentAND(e, "vid_gl20", 1, 1, "r_water_cameraentitiesonly", 0, 0);
 	me.TR(me);
 		me.TD(me, 1, 1, e = makeXonoticCheckBox_T(0, "cl_decals", _("Decals"),
 			_("Enable decals (bullet holes and blood)")));
diff --git a/xonotic-client.cfg b/xonotic-client.cfg
index 4abe50fa3..38cdb82af 100644
--- a/xonotic-client.cfg
+++ b/xonotic-client.cfg
@@ -863,6 +863,7 @@ r_shadow_glossintensity 1
 // use slightly better lighting than r_fullbright if map has no lightmaps, and for fullbrightplayers
 r_fullbright_directed 1
 
+r_water 1
 r_water_hideplayer 1 // hide your own feet/player model in refraction views, this way you don't see half of your body under water
 r_water_refractdistort 0.003