projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d822e9e)
crylink: let linkjoin damage ignore the attacker
authorRudolf Polzer <divverent@alientrap.org>
Tue, 16 Nov 2010 06:41:56 +0000 (07:41 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 16 Nov 2010 06:41:56 +0000 (07:41 +0100)
qcsrc/server/w_crylink.qc patch | blob | history

diff --git a/qcsrc/server/w_crylink.qc b/qcsrc/server/w_crylink.qc
index f17e075dd74c7a25df4127000afbe4d1a2521113..55d794fa3fcff58f9c578acd754d5926477adf3d 100644 (file)
--- a/qcsrc/server/w_crylink.qc
+++ b/qcsrc/server/w_crylink.qc
@@ -155,7 +155,7 @@ void W_Crylink_LinkJoinEffect_Think()
                                        n = n / cvar("g_balance_crylink_secondary_shots");
                                        RadiusDamage (e, e.realowner, cvar("g_balance_crylink_secondary_joinexplode_damage") * n, 
                                                                        cvar("g_balance_crylink_secondary_joinexplode_edgedamage") * n, 
                                        n = n / cvar("g_balance_crylink_secondary_shots");
                                        RadiusDamage (e, e.realowner, cvar("g_balance_crylink_secondary_joinexplode_damage") * n, 
                                                                        cvar("g_balance_crylink_secondary_joinexplode_edgedamage") * n, 
-                                                                       cvar("g_balance_crylink_secondary_joinexplode_radius") * n, world, 
+                                                                       cvar("g_balance_crylink_secondary_joinexplode_radius") * n, e.realowner, 
                                                                        cvar("g_balance_crylink_secondary_joinexplode_force") * n, e.projectiledeathtype, other);
 
                                        pointparticles(particleeffectnum("crylink_joinexplode"), self.origin, '0 0 0', n);
                                                                        cvar("g_balance_crylink_secondary_joinexplode_force") * n, e.projectiledeathtype, other);
 
                                        pointparticles(particleeffectnum("crylink_joinexplode"), self.origin, '0 0 0', n);
@@ -168,7 +168,7 @@ void W_Crylink_LinkJoinEffect_Think()
                                        n = n / cvar("g_balance_crylink_primary_shots");
                                        RadiusDamage (e, e.realowner, cvar("g_balance_crylink_primary_joinexplode_damage") * n, 
                                                                        cvar("g_balance_crylink_primary_joinexplode_edgedamage") * n, 
                                        n = n / cvar("g_balance_crylink_primary_shots");
                                        RadiusDamage (e, e.realowner, cvar("g_balance_crylink_primary_joinexplode_damage") * n, 
                                                                        cvar("g_balance_crylink_primary_joinexplode_edgedamage") * n, 
-                                                                       cvar("g_balance_crylink_primary_joinexplode_radius") * n, world, 
+                                                                       cvar("g_balance_crylink_primary_joinexplode_radius") * n, e.realowner, 
                                                                        cvar("g_balance_crylink_primary_joinexplode_force") * n, e.projectiledeathtype, other);
 
                                        pointparticles(particleeffectnum("crylink_joinexplode"), self.origin, '0 0 0', n);
                                                                        cvar("g_balance_crylink_primary_joinexplode_force") * n, e.projectiledeathtype, other);
 
                                        pointparticles(particleeffectnum("crylink_joinexplode"), self.origin, '0 0 0', n);