Add normal zoom reticle (when zooming with the zoom button). Still working on the...

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 5a66cb4baadbf0d561761eda21e70292627d55ca..9d5c902e3325985c2e7d1d49c6da1fd4e41461e2 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -207,6 +207,7 @@ seta crosshair_fireball_color_blue 0.2      "crosshair color blue component to displa
 seta crosshair_fireball_color_alpha 1  "crosshair alpha value to display when wielding the fireball"
 seta crosshair_fireball_size 1 "crosshair size when wielding the fireball"
 seta cl_reticle_nex 1 "draw aiming recticle for the nex weapon's zoom, 0 disables and values between 0 and 1 change alpha"
+seta cl_reticle_normal 1 "draw recticle when zooming with the zoom button, 0 disables and values between 0 and 1 change alpha"
 fov 90
 seta cl_velocityzoom 0 "velocity based zooming of fov, negative values zoom out"
 seta cl_velocityzoomtime 0.3   "time value for averaging speed values"

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index 8d283b106b1718faa929cdf232a58b409ab7962c..c65da4c5cffb80a3555873cc39024247b57fb177 100644 (file)
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -566,6 +566,12 @@ void CSQC_UpdateView(float w, float h)
        reticle_pos_x = (vid_conwidth - reticle_size_x) / 2;
        reticle_pos_y = (vid_conheight - reticle_size_y) / 2;
 
+       if(cvar("cl_reticle_normal"))
+       {
+               precache_pic("textures/reticle_normal");
+               if(reticle_type == 0 && current_zoomfraction)
+                       drawpic(reticle_pos, "textures/reticle_normal", reticle_size, '1 1 1', current_zoomfraction * cvar("cl_reticle_normal"), DRAWFLAG_NORMAL);
+       }
        if(cvar("cl_reticle_nex"))
        {
                precache_pic("textures/reticle_nex");

diff --git a/textures/reticle_normal.tga b/textures/reticle_normal.tga
new file mode 100644 (file)
index 0000000..b4b7f13
Binary files /dev/null and b/textures/reticle_normal.tga differ