Another tiny alignment I missed

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

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index 9e91a73b59217d02dc4ed6e5dd68592bd349e44a..ed1f303e2fafe11c4830f5ccc787b768fbabeb81 100644 (file)
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -555,22 +555,40 @@ 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)
-       if(button_zoom)
-               reticle_type = 0; // normal zoom
+       // the view to go back to normal, so reticle_type would become 0 as we fade out)
+       if(spectatee_status || getstati(STAT_HEALTH) <= 0)
+               reticle_type = 0; // prevent reticle from showing during the respawn zoom effect or for spectators
+       else if(button_zoom)
+               reticle_type = 1; // normal zoom
        else if(activeweapon == WEP_NEX && button_attack2)
-               reticle_type = 1; // nex zoom
+               reticle_type = 2; // nex zoom
 
-       reticle_size_x = max(vid_conwidth, vid_conheight);
-       reticle_size_y = max(vid_conwidth, vid_conheight);
-       reticle_pos_x = (vid_conwidth - reticle_size_x) / 2;
-       reticle_pos_y = (vid_conheight - reticle_size_y) / 2;
+       if(cvar("cl_reticle_stretch"))
+       {
+               reticle_size_x = vid_conwidth;
+               reticle_size_y = vid_conheight;
+               reticle_pos_x = 0;
+               reticle_pos_y = 0;
+       }
+       else
+       {
+               reticle_size_x = max(vid_conwidth, vid_conheight);
+               reticle_size_y = max(vid_conwidth, vid_conheight);
+               reticle_pos_x = (vid_conwidth - reticle_size_x) / 2;
+               reticle_pos_y = (vid_conheight - reticle_size_y) / 2;
+       }
 
-       if(cvar("cl_reticle_nex"))
+       if(cvar("cl_reticle_item_normal"))
+       {
+               precache_pic("textures/reticle_normal");
+               if(reticle_type == 1 && current_zoomfraction)
+                       drawpic(reticle_pos, "textures/reticle_normal", reticle_size, '1 1 1', current_zoomfraction * cvar("cl_reticle_item_normal"), DRAWFLAG_NORMAL);
+       }
+       if(cvar("cl_reticle_item_nex"))
        {
                precache_pic("textures/reticle_nex");
-               if(reticle_type == 1)
-                       drawpic(reticle_pos, "textures/reticle_nex", reticle_size, '1 1 1', current_zoomfraction * cvar("cl_reticle_nex"), DRAWFLAG_NORMAL);
+               if(reticle_type == 2 && current_zoomfraction)
+                       drawpic(reticle_pos, "textures/reticle_nex", reticle_size, '1 1 1', current_zoomfraction * cvar("cl_reticle_item_nex"), DRAWFLAG_NORMAL);
        }
 
        // Draw the mouse cursor