Merge remote branch 'origin/master' into tzork/vehicles-2

diff --cc qcsrc/client/Main.qc
Simple merge

diff --cc qcsrc/client/View.qc
index b92fcef61a94badd3ecfdf32d2f38aae2de5584a,c39daf22ecf9d259489df9b3f31f0f008993dba9..6e4354b4b45ca0d2dfeb67d8e95ba773f342d2b1
--- 1/qcsrc/client/View.qc
--- 2/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@@ -1194,11 -1183,11 +1194,11 @@@ void CSQC_UpdateView(float w, float h
                                        ring_scale = autocvar_crosshair_ring_reload_size;
                                        ring_alpha = autocvar_crosshair_ring_reload_alpha;
                                        ring_rgb = wcross_color;
 -                                      
 +
                                        // Note: This is to stop Taoki from complaining that the image doesn't match all potential balances.
                                        // if a new image for another weapon is added, add the code (and its respective file/value) here
-                                       if ((activeweapon == WEP_SNIPERRIFLE) && (weapon_clipsize == 80))
-                                               ring_image = "gfx/crosshair_ring_sniperrifle.tga";
+                                       if ((activeweapon == WEP_RIFLE) && (weapon_clipsize == 80))
+                                               ring_image = "gfx/crosshair_ring_rifle.tga";
                                        else
                                                ring_image = "gfx/crosshair_ring.tga";
                                }

diff --cc qcsrc/client/hud.qc
Simple merge

diff --cc qcsrc/server/autocvars.qh
Simple merge

diff --cc qcsrc/server/cl_client.qc
Simple merge

diff --cc qcsrc/server/cl_player.qc
Simple merge