From: FruitieX <fruitiex@gmail.com>
Date: Tue, 4 Jan 2011 00:58:09 +0000 (+0200)
Subject: consume more ammo for charging, hide the red circle completely if we dont use the... 
X-Git-Tag: xonotic-v0.5.0~318^2~133^2~10
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=02a30cf2d6a63fa7ae822a81e0bdb122e4caafa9;p=xonotic%2Fxonotic-data.pk3dir.git

consume more ammo for charging, hide the red circle completely if we dont use the charge pool
---

diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg
index 9ec88a807..f3060284b 100644
--- a/balanceXonotic.cfg
+++ b/balanceXonotic.cfg
@@ -475,7 +475,7 @@ set g_balance_nex_secondary_damage 0
 set g_balance_nex_secondary_force 0
 set g_balance_nex_secondary_refire 0
 set g_balance_nex_secondary_animtime 0
-set g_balance_nex_secondary_ammo 1
+set g_balance_nex_secondary_ammo 1.6
 set g_balance_nex_secondary_damagefalloff_mindist 0
 set g_balance_nex_secondary_damagefalloff_maxdist 0
 set g_balance_nex_secondary_damagefalloff_halflife 0
diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index 704e58107..3a929f970 100644
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -959,15 +959,6 @@ void CSQC_UpdateView(float w, float h)
 					rgb = eX * autocvar_crosshair_ring_nex_inner_color_red + eY * autocvar_crosshair_ring_nex_inner_color_green + eZ * autocvar_crosshair_ring_nex_inner_color_blue;
 					DrawCircleClippedPic(wcross_origin, wcross_size_x * ring_scale, "gfx/crosshair_ring_inner.tga", nex_chargepool, rgb, wcross_alpha * a, DRAWFLAG_ADDITIVE);
 				}
-				else
-				{
-					// indicate how much we're charging right now with an inner circle
-					a = autocvar_crosshair_ring_nex_inner_alpha;
-					nex_charge_movingavg = (1 - autocvar_crosshair_ring_nex_currentcharge_movingavg_rate) * nex_charge_movingavg + autocvar_crosshair_ring_nex_currentcharge_movingavg_rate * nex_charge;
-
-					rgb = eX * autocvar_crosshair_ring_nex_inner_color_red + eY * autocvar_crosshair_ring_nex_inner_color_green + eZ * autocvar_crosshair_ring_nex_inner_color_blue;
-					DrawCircleClippedPic(wcross_origin, wcross_size_x * ring_scale, "gfx/crosshair_ring_inner.tga", bound(0, autocvar_crosshair_ring_nex_currentcharge_scale * (nex_charge - nex_charge_movingavg), 1), rgb, wcross_alpha * a, DRAWFLAG_ADDITIVE);
-				}
 
 				// draw the charge
 				a = autocvar_crosshair_ring_nex_outer_alpha;