From: Samual Lenks <samual@xonotic.org>
Date: Thu, 20 Feb 2014 05:47:14 +0000 (-0500)
Subject: Add burst ammo control
X-Git-Tag: xonotic-v0.8.0~152^2~64
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=73fc2ce032ef8be7ccc0c624eae0e4dd6594dae8;p=xonotic%2Fxonotic-data.pk3dir.git

Add burst ammo control
---

diff --git a/qcsrc/common/weapons/w_arc.qc b/qcsrc/common/weapons/w_arc.qc
index c4932a23d..a5521462f 100644
--- a/qcsrc/common/weapons/w_arc.qc
+++ b/qcsrc/common/weapons/w_arc.qc
@@ -38,6 +38,7 @@ REGISTER_WEAPON(
 	w_cvar(id, sn, NONE, beam_refire) \
 	w_cvar(id, sn, NONE, beam_returnspeed) \
 	w_cvar(id, sn, NONE, beam_tightness) \
+	w_cvar(id, sn, NONE, burst_ammo) \
 	w_cvar(id, sn, NONE, burst_damage) \
 	w_cvar(id, sn, NONE, burst_healing_aps) \
 	w_cvar(id, sn, NONE, burst_healing_hps) \
@@ -160,10 +161,16 @@ void W_Arc_Beam_Think(void)
 	float dt = frametime;
 	if(!(self.owner.items & IT_UNLIMITED_WEAPON_AMMO))
 	{
-		if(WEP_CVAR(arc, beam_ammo))
+		float rootammo;
+		if(burst)
+			{ rootammo = WEP_CVAR(arc, burst_ammo); }
+		else
+			{ rootammo = WEP_CVAR(arc, beam_ammo); }
+
+		if(rootammo)
 		{
-			dt = min(dt, self.owner.WEP_AMMO(ARC) / WEP_CVAR(arc, beam_ammo));
-			self.owner.WEP_AMMO(ARC) = max(0, self.owner.WEP_AMMO(ARC) - WEP_CVAR(arc, beam_ammo) * frametime);
+			dt = min(dt, self.owner.WEP_AMMO(ARC) / rootammo);
+			self.owner.WEP_AMMO(ARC) = max(0, self.owner.WEP_AMMO(ARC) - (rootammo * frametime));
 		}
 	}