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

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / View.qc

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index 9e91a73b59217d02dc4ed6e5dd68592bd349e44a..c65da4c5cffb80a3555873cc39024247b57fb177 100644 (file)
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -554,8 +554,8 @@ void CSQC_UpdateView(float w, float h)
 
        // Draw the aiming reticle for weapons that use it
        // 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 and use that reticle)
+       // 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 and use that image instead)
        if(button_zoom)
                reticle_type = 0; // normal zoom
        else if(activeweapon == WEP_NEX && button_attack2)
@@ -566,10 +566,16 @@ 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");
-               if(reticle_type == 1)
+               if(reticle_type == 1 && current_zoomfraction)
                        drawpic(reticle_pos, "textures/reticle_nex", reticle_size, '1 1 1', current_zoomfraction * cvar("cl_reticle_nex"), DRAWFLAG_NORMAL);
        }