]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Add simple fix for electro combo exception (ONLY apply the exception if it's true...
authorSamual <samual@xonotic.org>
Sat, 1 Oct 2011 05:29:45 +0000 (01:29 -0400)
committerSamual <samual@xonotic.org>
Sat, 1 Oct 2011 05:29:45 +0000 (01:29 -0400)
qcsrc/server/w_electro.qc

index 08b963431d7b5e1a8246caff05bdb4210f654c3f..d44bcdc69d5913c35d30493dffd644827127a868 100644 (file)
@@ -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;