Update cl_reticle* cvars and fix/improve their descriptions

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index cc58245383695ce6febb074fbedacaf5a2c5dc5b..16a7fe4ce44e8294e13aaf57a9b9c0b20ffa297f 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -55,10 +55,13 @@ _cl_name ""
 _cl_playermodel models/player/erebus.iqm
 _cl_playerskin 0
 
-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 (breaks image proportions)"
-seta cl_reticle_item_vortex 1 "draw aiming reticle for the vortex 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"
+seta cl_reticle 1 "enable zoom reticles"
+seta cl_reticle_stretch 0 "stretch reticles so they fit the screen (breaks image proportions)"
+seta cl_reticle_normal 1 "draw an aiminig reticle when zooming with the zoom button"
+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"
+
 fov 100
 seta cl_velocityzoom_enabled 0 "velocity based zooming of fov"
 seta cl_velocityzoom_factor 0 "factor of fov zooming (negative values zoom out)"

diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh
index f06c5bfb3bd0f66e6dbc25ad67f201587b50a7c0..5c1d2c544304e57e27c2a7e74e58a495e536f292 100644 (file)
--- a/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@ -61,10 +61,10 @@ float autocvar_cl_particles_oldvortexbeam;
 float autocvar_cl_particles_quality;
 float autocvar_cl_projectiles_sloppy;
 float autocvar_cl_readpicture_force;
-var float autocvar_cl_reticle = 1;
-var float autocvar_cl_reticle_normal_alpha = 1;
-var float autocvar_cl_reticle_weapon = 1;
-var float autocvar_cl_reticle_weapon_alpha = 1;
+float autocvar_cl_reticle;
+float autocvar_cl_reticle_normal_alpha;
+float autocvar_cl_reticle_weapon;
+float autocvar_cl_reticle_weapon_alpha;
 float autocvar_cl_reticle_stretch;
 float autocvar_cl_spawn_event_particles;
 var float autocvar_cl_spawn_event_sound = 1;