From: Samual Date: Sat, 1 Oct 2011 05:29:45 +0000 (-0400) Subject: Add simple fix for electro combo exception (ONLY apply the exception if it's true... X-Git-Tag: xonotic-v0.6.0~40^2~92^2~1^2~12 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c2901974f1a8d86fa039f326f2ff2651ff05a600;p=xonotic%2Fxonotic-data.pk3dir.git Add simple fix for electro combo exception (ONLY apply the exception if it's true, otherwise do -1 so that it doesn't override at the wrong times) --- diff --git a/qcsrc/server/w_electro.qc b/qcsrc/server/w_electro.qc index 08b963431..d44bcdc69 100644 --- a/qcsrc/server/w_electro.qc +++ b/qcsrc/server/w_electro.qc @@ -87,7 +87,7 @@ void W_Plasma_Damage (entity inflictor, entity attacker, float damage, float dea // note: combos are usually triggered by W_Plasma_TriggerCombo, not damage float is_combo = (inflictor.classname == "plasma_chain" || inflictor.classname == "plasma_prim"); - if (!W_CheckProjectileDamage(inflictor.realowner, self.realowner, deathtype, is_combo)) + if (!W_CheckProjectileDamage(inflictor.realowner, self.realowner, deathtype, (is_combo ? 1 : -1))) return; // g_projectiles_damage says to halt self.health = self.health - damage;