]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
show linkjoin effect only if a radiusdamage is done (joinexplode)
authorRudolf Polzer <divverent@alientrap.org>
Sun, 14 Nov 2010 19:01:23 +0000 (20:01 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 14 Nov 2010 19:01:23 +0000 (20:01 +0100)
qcsrc/server/w_crylink.qc

index 65ebdd836c519a143a72ef2d65038fea7b5913a7..cd404334ef86258f60a5011154039da885ae6db5 100644 (file)
@@ -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);