From: Mario <mario.mario@y7mail.com>
Date: Mon, 21 Oct 2024 10:41:06 +0000 (+0000)
Subject: Hide the zoom scope while in third person mode
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a6a3cdf4145b7894e90f7b08a757e204d5cf80b1;p=xonotic%2Fxonotic-data.pk3dir.git

Hide the zoom scope while in third person mode
---

diff --git a/qcsrc/client/hud/crosshair.qc b/qcsrc/client/hud/crosshair.qc
index feea596f1..39d568696 100644
--- a/qcsrc/client/hud/crosshair.qc
+++ b/qcsrc/client/hud/crosshair.qc
@@ -701,7 +701,7 @@ void DrawReticle(entity this)
 	// reticle_type is changed to the item we are zooming / aiming with, to decide which reticle to use
 	// It must be a persisted float for fading out to work properly (you let go of the zoom button for
 	// the view to go back to normal, so reticle_type would become 0 as we fade out)
-	if(spectatee_status || is_dead || hud != HUD_NORMAL || this.viewloc)
+	if(spectatee_status || is_dead || hud != HUD_NORMAL || this.viewloc || (autocvar_chase_active != 0 && !autocvar_cl_reticle_chase))
 	{
 		// no zoom reticle while dead
 		reticle_type = 0;
diff --git a/qcsrc/client/hud/crosshair.qh b/qcsrc/client/hud/crosshair.qh
index 4cd7715af..28db99094 100644
--- a/qcsrc/client/hud/crosshair.qh
+++ b/qcsrc/client/hud/crosshair.qh
@@ -5,6 +5,7 @@ float autocvar_cl_reticle_normal_alpha = 1;
 bool autocvar_cl_reticle_weapon = 1;
 float autocvar_cl_reticle_weapon_alpha = 1;
 bool autocvar_cl_reticle_stretch;
+bool autocvar_cl_reticle_chase;
 string autocvar_crosshair;
 string autocvar_crosshair_2d = "54";
 float autocvar_crosshair_alpha;
diff --git a/xonotic-client.cfg b/xonotic-client.cfg
index 7872f40c1..d3009cd34 100644
--- a/xonotic-client.cfg
+++ b/xonotic-client.cfg
@@ -47,6 +47,7 @@ seta cl_reticle_normal 1 "draw an aiming reticle when zooming with the zoom butt
 seta cl_reticle_normal_alpha 1 "alpha of the normal reticle"
 seta cl_reticle_weapon 1 "draw custom aiming reticle when zooming with certain weapons"
 seta cl_reticle_weapon_alpha 1 "alpha of the custom reticle"
+seta cl_reticle_chase 0 "show the zoom reticle while in chase camera mode"
 
 fov 100
 seta cl_velocityzoom_enabled 0 "velocity based zooming of fov"