From 3f27259aecb0056afa4a9327280b6eac72d794a4 Mon Sep 17 00:00:00 2001 From: Samual Date: Tue, 25 Oct 2011 13:30:00 -0400 Subject: [PATCH] Add master cvar for cl_reticle so you can disable/enable it altogether. --- defaultXonotic.cfg | 1 + qcsrc/client/Main.qc | 11 +++++++---- qcsrc/client/View.qc | 2 +- qcsrc/client/autocvars.qh | 1 + 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 23866b0e7..c9a5d9fd0 100644 --- 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 7abf72087..996d88697 100644 --- 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 5cfe93447..ac976db67 100644 --- 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 5b3be971c..8cb994b08 100644 --- 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; -- 2.39.2