From: Rudolf Polzer Date: Sun, 14 Nov 2010 19:01:23 +0000 (+0100) Subject: show linkjoin effect only if a radiusdamage is done (joinexplode) X-Git-Tag: xonotic-v0.1.0preview~141 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=887bc12b10859e61d597fb9d4dd5e31b702c7009;p=xonotic%2Fxonotic-data.pk3dir.git show linkjoin effect only if a radiusdamage is done (joinexplode) --- diff --git a/qcsrc/server/w_crylink.qc b/qcsrc/server/w_crylink.qc index 65ebdd836..cd404334e 100644 --- a/qcsrc/server/w_crylink.qc +++ b/qcsrc/server/w_crylink.qc @@ -148,8 +148,6 @@ void W_Crylink_LinkJoinEffect_Think() } if(n >= 2) { - - if(e.projectiledeathtype & HITTYPE_SECONDARY) { if(cvar("g_balance_crylink_secondary_joinexplode")) @@ -159,6 +157,8 @@ void W_Crylink_LinkJoinEffect_Think() cvar("g_balance_crylink_secondary_joinexplode_edgedamage") * n, cvar("g_balance_crylink_secondary_joinexplode_radius") * n, world, cvar("g_balance_crylink_secondary_joinexplode_force") * n, e.projectiledeathtype, other); + + pointparticles(particleeffectnum("crylink_linkjoin"), self.origin, '0 0 0', n); } } else @@ -170,12 +170,10 @@ void W_Crylink_LinkJoinEffect_Think() cvar("g_balance_crylink_primary_joinexplode_edgedamage") * n, cvar("g_balance_crylink_primary_joinexplode_radius") * n, world, cvar("g_balance_crylink_primary_joinexplode_force") * n, e.projectiledeathtype, other); + + pointparticles(particleeffectnum("crylink_linkjoin"), self.origin, '0 0 0', n); } } - - // they seem to touch... - // TODO make a specific particle effect for this - pointparticles(particleeffectnum("crylink_linkjoin"), self.origin, '0 0 0', 1); } } remove(self);