From 62ae1e57632d85d9667da1be62bf17c4c1aa94df Mon Sep 17 00:00:00 2001 From: div0 Date: Sun, 27 Sep 2009 10:00:31 +0000 Subject: [PATCH] electro: only trigger combos from PRIMARY git-svn-id: svn://svn.icculus.org/nexuiz/trunk@7938 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/w_electro.qc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/data/qcsrc/server/w_electro.qc b/data/qcsrc/server/w_electro.qc index 36e6e63b9..6b74fdc96 100644 --- a/data/qcsrc/server/w_electro.qc +++ b/data/qcsrc/server/w_electro.qc @@ -35,8 +35,6 @@ void W_Plasma_Explode (void) if(IsFlying(other)) announce(self.owner, "announcer/male/electrobitch.wav"); - W_Plasma_TriggerCombo(self.origin, cvar("g_balance_electro_primary_comboradius"), self.owner); - self.event_damage = SUB_Null; self.takedamage = DAMAGE_NO; if (self.movetype == MOVETYPE_BOUNCE) @@ -45,6 +43,7 @@ void W_Plasma_Explode (void) } else { + W_Plasma_TriggerCombo(self.origin, cvar("g_balance_electro_primary_comboradius"), self.owner); RadiusDamage (self, self.owner, cvar("g_balance_electro_primary_damage"), cvar("g_balance_electro_primary_edgedamage"), cvar("g_balance_electro_primary_radius"), world, cvar("g_balance_electro_primary_force"), self.projectiledeathtype, other); } -- 2.39.2