From: Samual Lenks <samual@xonotic.org>
Date: Sun, 8 Dec 2013 07:15:00 +0000 (-0500)
Subject: Avoid some unnecessary thinking
X-Git-Tag: xonotic-v0.8.0~152^2~291
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=67c7a6894cec45289bbd0b0146557bf2da36b663;p=xonotic%2Fxonotic-data.pk3dir.git

Avoid some unnecessary thinking
---

diff --git a/qcsrc/common/weapons/w_electro.qc b/qcsrc/common/weapons/w_electro.qc
index ed8154ee0..4748ace2c 100644
--- a/qcsrc/common/weapons/w_electro.qc
+++ b/qcsrc/common/weapons/w_electro.qc
@@ -217,15 +217,18 @@ void W_Plasma_Damage(entity inflictor, entity attacker, float damage, float deat
 
 void W_Plasma_Think()
 {
-	self.nextthink = min(time + WEP_CVAR_PRI(electro, midaircombo_interval), self.ltime);
-	
 	if(time >= self.ltime)
 	{
 		self.use();
 		return;
 	}
-	
-	W_Plasma_TriggerCombo(self.origin, WEP_CVAR_PRI(electro, midaircombo_radius), self.realowner);
+
+	if(WEP_CVAR_PRI(electro, midaircombo_radius))
+	{
+		self.nextthink = min(time + WEP_CVAR_PRI(electro, midaircombo_interval), self.ltime);
+		W_Plasma_TriggerCombo(self.origin, WEP_CVAR_PRI(electro, midaircombo_radius), self.realowner);
+	}
+	else { self.nextthink = self.ltime; }
 }
 
 void W_Electro_Attack_Bolt(void)