From: Rudolf Polzer Date: Tue, 9 Nov 2010 19:45:41 +0000 (+0100) Subject: oops, this workaround was missing (don't detonate all projectiles if a crylink projec... X-Git-Tag: xonotic-v0.1.0preview~173 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=b82d77b246acc04defe14dbb41f3f312a4f2451f oops, this workaround was missing (don't detonate all projectiles if a crylink projectile simply "dies") --- diff --git a/qcsrc/server/w_crylink.qc b/qcsrc/server/w_crylink.qc index 2e10d0eea4..566563487b 100644 --- a/qcsrc/server/w_crylink.qc +++ b/qcsrc/server/w_crylink.qc @@ -173,12 +173,19 @@ void W_Crylink_Touch (void) f = cvar("g_balance_crylink_primary_bouncedamagefactor"); if(a) f *= a; - if (RadiusDamage (self, self.realowner, cvar("g_balance_crylink_primary_damage") * f, cvar("g_balance_crylink_primary_edgedamage") * f, cvar("g_balance_crylink_primary_radius"), world, cvar("g_balance_crylink_primary_force") * f, self.projectiledeathtype, other) || finalhit) + if (RadiusDamage (self, self.realowner, cvar("g_balance_crylink_primary_damage") * f, cvar("g_balance_crylink_primary_edgedamage") * f, cvar("g_balance_crylink_primary_radius"), world, cvar("g_balance_crylink_primary_force") * f, self.projectiledeathtype, other)) { W_Crylink_LinkExplode(self.queuenext, self); remove (self); return; } + else if(finalhit) + { + // just unlink + W_Crylink_Dequeue(self); + remove(self); + return; + } self.cnt = self.cnt - 1; self.angles = vectoangles(self.velocity); self.owner = world;