Hide the zoom scope while in third person mode

diff --git a/qcsrc/client/hud/crosshair.qc b/qcsrc/client/hud/crosshair.qc
index feea596f186d148cfe3935e9f97155c75ce5d709..39d56869627371de41116502f5e98f3f07cf2877 100644 (file)
--- 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 4cd7715af49883dc82deadb9eb203e6f97ad1f2a..28db99094d231a1611fde5f6229ef81b7e337660 100644 (file)
--- 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 7872f40c178c618976df5bcc226bf0a46f46e341..d3009cd34dc5a336b7a74bea388ac18017fbece8 100644 (file)
--- 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"