Add master cvar for cl_reticle so you can disable/enable it altogether.

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 23866b0e7134c79b497a30a2c742d68e85e5aef8..c9a5d9fd066d5d030b9fbf6c2f875b3f29edb7bb 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -213,6 +213,7 @@ seta crosshair_ring_reload 1 "main cvar to enable or disable ammo crosshair ring
 seta crosshair_ring_reload_size 2.5    "reload ring size"
 seta crosshair_ring_reload_alpha 0.2   "reload ring alpha"
 
+seta cl_reticle 1 "control for toggling whether ANY zoom reticles are shown"
 seta cl_reticle_stretch 0 "whether to stretch reticles so they fit the screen (brakes image proportions)"
 seta cl_reticle_item_nex 1 "draw aiming reticle for the nex weapon's zoom, 0 disables and values between 0 and 1 change alpha"
 seta cl_reticle_item_normal 1 "draw reticle when zooming with the zoom button, 0 disables and values between 0 and 1 change alpha"

diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc
index 7abf7208788d9256deb299ad538dcaa134480d7a..996d88697fca95dffd18935f162436aa0f5e3e69 100644 (file)
--- a/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@ -149,10 +149,13 @@ void CSQC_Init(void)
                cl_announcer_prev = strzone(autocvar_cl_announcer);
        }
        Tuba_Precache();
-
-       if(autocvar_cl_reticle_item_normal) precache_pic("gfx/reticle_normal");
-       if(autocvar_cl_reticle_item_nex) precache_pic("gfx/reticle_nex");
-
+       
+       if(autocvar_cl_reticle)
+       {
+               if(autocvar_cl_reticle_item_normal) { precache_pic("gfx/reticle_normal"); }
+               if(autocvar_cl_reticle_item_nex) { precache_pic("gfx/reticle_nex"); }
+       }
+       
        get_mi_min_max_texcoords(1); // try the CLEVER way first
        minimapname = strcat("gfx/", mi_shortname, "_radar.tga");
        shortmapname = mi_shortname;

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index 5cfe9344779f72c7238f51e577faeb4b3e816f14..ac976db67bdd76f3c12c2fc75bdd00b4a00cf0d8 100644 (file)
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -729,7 +729,7 @@ void CSQC_UpdateView(float w, float h)
        else if(activeweapon == WEP_NEX && button_attack2 || activeweapon == WEP_RIFLE && button_attack2)
                reticle_type = 2; // nex zoom
     
-       if (reticle_type)
+       if(reticle_type && autocvar_cl_reticle)
        {
                if(autocvar_cl_reticle_stretch)
                {

diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh
index 5b3be971c5f360f4dae72a4fbee4f01315a537a7..8cb994b0825ee22b0b05dbfc42fb807914db694b 100644 (file)
--- a/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@ -57,6 +57,7 @@ float autocvar_cl_particles_oldnexbeam;
 float autocvar_cl_particles_quality;
 float autocvar_cl_projectiles_sloppy;
 float autocvar_cl_readpicture_force;
+var float autocvar_cl_reticle = 1;
 float autocvar_cl_reticle_item_nex;
 float autocvar_cl_reticle_item_normal;
 float autocvar_cl_reticle_stretch;