From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Fri, 21 Jan 2011 00:18:44 +0000 (+0200)
Subject: *Temporary* change so we can see the ammo circle with all weapons
X-Git-Tag: xonotic-v0.5.0~309^2~7^2~178
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c226da1cdcc87864bc1fe54a9c39d03e699527ce;p=xonotic%2Fxonotic-data.pk3dir.git

*Temporary* change so we can see the ammo circle with all weapons
---

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index d3bbf79cb..e5d517e35 100644
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -996,7 +996,7 @@ void CSQC_UpdateView(float w, float h)
 				nex_charge_movingavg = nex_charge;
 
 			// ring around crosshair representing bullets left in camping rifle clip
-			if (activeweapon == WEP_SNIPERRIFLE && cr_maxbullets)
+			//if (activeweapon == WEP_SNIPERRIFLE && cr_maxbullets)
 			{
 				bullets = getstati(STAT_BULLETS_LOADED);
 				f = bound(0, bullets / cr_maxbullets, 1);
@@ -1004,7 +1004,7 @@ void CSQC_UpdateView(float w, float h)
 				a = autocvar_crosshair_ring_sniperrifle_alpha;
 				DrawCircleClippedPic(wcross_origin, wcross_size_x * ring_scale, "gfx/crosshair_ring.tga", f, wcross_color, wcross_alpha * a, DRAWFLAG_ADDITIVE);
 			}
-			else if (activeweapon == WEP_NEX && nex_charge) // ring around crosshair representing velocity-dependent damage for the nex
+			/*else*/ if (activeweapon == WEP_NEX && nex_charge) // ring around crosshair representing velocity-dependent damage for the nex
 			{
 				if(nex_chargepool || use_nex_chargepool)
 				{