From: Mario <mario.mario@y7mail.com>
Date: Thu, 10 Oct 2013 02:40:43 +0000 (-0700)
Subject: Remove switchweapon from weapon charge check
X-Git-Tag: xonotic-v0.8.0~70^2~24
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4823dba845d1910e5ce0be2cf891418b4ac1941e;p=xonotic%2Fxonotic-data.pk3dir.git

Remove switchweapon from weapon charge check
---

diff --git a/qcsrc/server/mutators/mutator_overkill.qc b/qcsrc/server/mutators/mutator_overkill.qc
index e2b1fb92d..94256bc76 100644
--- a/qcsrc/server/mutators/mutator_overkill.qc
+++ b/qcsrc/server/mutators/mutator_overkill.qc
@@ -23,7 +23,7 @@ void ok_IncreaseCharge(entity ent, float wep)
 		ent.ammo_charge[wep] = min(autocvar_g_overkill_ammo_charge_limit, ent.ammo_charge[wep] + cvar(sprintf("g_overkill_ammo_charge_rate_%s", wepent.netname)) * frametime / W_TICSPERFRAME);
 }
 
-float ok_CheckWeaponCharge(entity ent, float wep, float swep)
+float ok_CheckWeaponCharge(entity ent, float wep)
 {
 	if not(autocvar_g_overkill_ammo_charge) return TRUE;
 	//if(wep != swep) return TRUE; // switching, don't even bother checking
@@ -136,7 +136,7 @@ MUTATOR_HOOKFUNCTION(ok_PlayerPreThink)
 	self.ok_ammo_charge = self.ammo_charge[self.weapon];
 
 	if(autocvar_g_overkill_ammo_charge)
-	if(!ok_CheckWeaponCharge(self, self.weapon, self.switchweapon))
+	if(!ok_CheckWeaponCharge(self, self.weapon))
 	{
 		if(autocvar_g_overkill_ammo_charge_notice && time > self.ok_notice_time && self.BUTTON_ATCK && IS_REAL_CLIENT(self))
 		{