From: FruitieX <rasse@rasse-laptop.(none)>
Date: Thu, 21 Oct 2010 19:49:14 +0000 (+0300)
Subject: also add a time check to the dryfire sound, apparently it plays many times for bots
X-Git-Tag: xonotic-v0.1.0preview~139^2^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bdd8556719bfcae595068d90d0aafaef9308d38b;p=xonotic%2Fxonotic-data.pk3dir.git

also add a time check to the dryfire sound, apparently it plays many times for bots
---

diff --git a/qcsrc/server/cl_weaponsystem.qc b/qcsrc/server/cl_weaponsystem.qc
index 4537573c5..4430d5e78 100644
--- a/qcsrc/server/cl_weaponsystem.qc
+++ b/qcsrc/server/cl_weaponsystem.qc
@@ -1106,6 +1106,7 @@ void W_SwitchToOtherWeapon(entity pl)
 	if(ww)
 		W_SwitchWeapon_Force(pl, ww);
 }
+.float prevdryfire;
 float weapon_prepareattack_checkammo(float secondary)
 {
 	if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
@@ -1117,8 +1118,11 @@ float weapon_prepareattack_checkammo(float secondary)
 		for(mine = world; (mine = find(mine, classname, "mine")); ) if(mine.owner == self)
 			return FALSE;
 
-		if(self.weapon == self.switchweapon) // only play once BEFORE starting to switch weapons
+		if(self.weapon == self.switchweapon && time - self.prevdryfire > 1) // only play once BEFORE starting to switch weapons
+		{
 			sound (self, CHAN_AUTO, "weapons/dryfire.wav", VOL_BASE, ATTN_NORM);
+			self.prevdryfire = time;
+		}
 
 		W_SwitchToOtherWeapon(self);
 		return FALSE;