From: Mircea Kitsune Date: Fri, 21 Jan 2011 02:12:58 +0000 (+0200) Subject: Correct code for crosshair ring. Still need to rename some stuff though X-Git-Tag: xonotic-v0.5.0~309^2~7^2~172 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=dc0867c9e772006556c90df570d8c9d83a3b88c5;p=xonotic%2Fxonotic-data.pk3dir.git Correct code for crosshair ring. Still need to rename some stuff though --- diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc index e5d517e35..8f64e8d86 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 (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 + if (activeweapon == WEP_NEX && nex_charge) // ring around crosshair representing velocity-dependent damage for the nex { if(nex_chargepool || use_nex_chargepool) {