Merge remote branch 'origin/fruitiex/precache_crosshair_ring'

diff --combined qcsrc/client/View.qc
index 157b68d007b45c207271e0a0a85a0c54fc8ee66e,59b49d9662f68717d0443b5f1ec1491ea290db7d..9953af664b7b4db76233623bfa69a9c8d2aa166c
--- 1/qcsrc/client/View.qc
--- 2/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@@ -698,6 -698,7 +698,7 @@@ void CSQC_UpdateView(float w, float h
                                CSQC_common_hud();
  
  
+               precache_pic("gfx/nex_ring.tga");
                // ring around crosshair representing velocity-dependent damage for the nex
                if (activeweapon == WEP_NEX)
                {
@@@ -893,12 -894,7 +894,12 @@@
                                {
                                        CROSSHAIR_DO_BLUR(CROSSHAIR_DRAW_RING, wcross_resolution, wcross_name, wcross_alpha);
                                }
 +
                                CROSSHAIR_DRAW(wcross_resolution, wcross_name, wcross_alpha * f);
 +
 +                              if(cvar("crosshair_dot"))
 +                                      CROSSHAIR_DRAW(wcross_resolution * cvar("crosshair_dot_size"), "gfx/crosshairdot.tga", wcross_alpha * f * cvar("crosshair_dot_alpha"));
 +
                                wcross_name_alpha_goal_prev = f;
                        }
                }