From: Jakob MG <jakob_mg@hotmail.com>
Date: Thu, 26 May 2011 17:26:56 +0000 (+0200)
Subject: Merge remote branch 'origin/master' into tzork/vehicles-2
X-Git-Tag: xonotic-v0.5.0~199^2~11^2~44
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5be16497ca10373f33c220f727d88439277352ce;p=xonotic%2Fxonotic-data.pk3dir.git

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

5be16497ca10373f33c220f727d88439277352ce
diff --cc qcsrc/client/View.qc
index b92fcef61,c39daf22e..6e4354b4b
--- a/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";
  				}