Some bugfixes from Xonotic, regarding features I ported in VT

[voretournament/voretournament.git] / data / qcsrc / client / View.qc

diff --git a/data/qcsrc/client/View.qc b/data/qcsrc/client/View.qc
index af6ebd65ee90cfd627ee9320bb8c5990477d3150..5e9d75c432609e5e6cb9bc66e8d85cb2e42d021b 100644 (file)
--- a/data/qcsrc/client/View.qc
+++ b/data/qcsrc/client/View.qc
@@ -474,35 +474,36 @@ void CSQC_UpdateView(float w, float h)
        else if(button_zoom || zoomscript_caught)\r
                reticle_type = 1; // normal zoom\r
 \r
-       if(cvar("cl_reticle_stretch"))\r
+       if (reticle_type)\r
        {\r
-               reticle_size_x = vid_conwidth;\r
-               reticle_size_y = vid_conheight;\r
-               reticle_pos_x = 0;\r
-               reticle_pos_y = 0;\r
-       }\r
-       else\r
-       {\r
-               reticle_size_x = max(vid_conwidth, vid_conheight);\r
-               reticle_size_y = max(vid_conwidth, vid_conheight);\r
-               reticle_pos_x = (vid_conwidth - reticle_size_x) / 2;\r
-               reticle_pos_y = (vid_conheight - reticle_size_y) / 2;\r
-       }\r
+               if(cvar("cl_reticle_stretch"))\r
+               {\r
+                       reticle_size_x = vid_conwidth;\r
+                       reticle_size_y = vid_conheight;\r
+                       reticle_pos_x = 0;\r
+                       reticle_pos_y = 0;\r
+               }\r
+               else\r
+               {\r
+                       reticle_size_x = max(vid_conwidth, vid_conheight);\r
+                       reticle_size_y = max(vid_conwidth, vid_conheight);\r
+                       reticle_pos_x = (vid_conwidth - reticle_size_x) / 2;\r
+                       reticle_pos_y = (vid_conheight - reticle_size_y) / 2;\r
+               }\r
 \r
-       f = current_zoomfraction;\r
-       if(zoomscript_caught)\r
-               f = 1;\r
-       if(cvar("cl_reticle_item_normal"))\r
-       {\r
-               precache_pic("gfx/reticle_normal");\r
-               if(reticle_type == 1 && f)\r
-                       drawpic(reticle_pos, "gfx/reticle_normal", reticle_size, '1 1 1', f * cvar("cl_reticle_item_normal"), DRAWFLAG_NORMAL);\r
-       }\r
-       if(cvar("cl_reticle_item_weapon"))\r
-       {\r
-               precache_pic("gfx/reticle_weapon");\r
-               if(reticle_type == 2 && f)\r
-                       drawpic(reticle_pos, "gfx/reticle_weapon", reticle_size, '1 1 1', f * cvar("cl_reticle_item_weapon"), DRAWFLAG_NORMAL);\r
+               f = current_zoomfraction;\r
+               if(zoomscript_caught)\r
+                       f = 1;\r
+               if(cvar("cl_reticle_item_normal"))\r
+               {\r
+                       if(reticle_type == 1 && f)\r
+                               drawpic(reticle_pos, "gfx/reticle_normal", reticle_size, '1 1 1', f * cvar("cl_reticle_item_normal"), DRAWFLAG_NORMAL);\r
+               }\r
+               if(cvar("cl_reticle_item_weapon"))\r
+               {\r
+                       if(reticle_type == 2 && f)\r
+                               drawpic(reticle_pos, "gfx/reticle_weapon", reticle_size, '1 1 1', f * cvar("cl_reticle_item_weapon"), DRAWFLAG_NORMAL);\r
+               }\r
        }\r
 \r
        // screen effects\r