cvar: g_projectiles_keep_owner (keep owner when projectile is damaged), was previousl...

diff --git a/balance25.cfg b/balance25.cfg
index bea9ad263a3243ef5904d70fe8de2eca52047a3b..aafb163b441941ea73ad9a0ba736837fcc0bc25f 100644 (file)
--- a/balance25.cfg
+++ b/balance25.cfg
@@ -162,6 +162,7 @@ set g_projectiles_damage 2
 // 0: only damage from contents (lava/slime) or exceptions 
 // 1: only self damage or damage from contents or exceptions
 // 2: allow all damage to projectiles normally
+set g_projectiles_keep_owner 0
 set g_projectiles_newton_style 2
 // possible values:
 // 0: absolute velocity projectiles (like Quake)

diff --git a/balanceFruitieX.cfg b/balanceFruitieX.cfg
index 16286fe0f8b85eb63c3529617bef7dc2cb259a74..1bb8989120df04a0f5f3b7864c66c23ab0df2f57 100644 (file)
--- a/balanceFruitieX.cfg
+++ b/balanceFruitieX.cfg
@@ -162,6 +162,7 @@ set g_projectiles_damage 2
 // 0: only damage from contents (lava/slime) or exceptions 
 // 1: only self damage or damage from contents or exceptions
 // 2: allow all damage to projectiles normally
+set g_projectiles_keep_owner 0
 set g_projectiles_newton_style 2
 // possible values:
 // 0: absolute velocity projectiles (like Quake)

diff --git a/balanceXPM.cfg b/balanceXPM.cfg
index d3478a969f292339c212b96bc934eb284e9adc2e..759551d8d2357a4a2e53f7f1125d229659802fe7 100644 (file)
--- a/balanceXPM.cfg
+++ b/balanceXPM.cfg
@@ -162,6 +162,7 @@ set g_projectiles_damage 1
 // 0: only damage from contents (lava/slime) or exceptions 
 // 1: only self damage or damage from contents or exceptions
 // 2: allow all damage to projectiles normally
+set g_projectiles_keep_owner 0
 set g_projectiles_newton_style 0
 // possible values:
 // 0: absolute velocity projectiles (like Quake)

diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg
index b7dbd3db8ceb72ecd803766d758db460b7b4c1bd..52c8a74d84cecfe381db5adbb156bc778f7da233 100644 (file)
--- a/balanceXonotic.cfg
+++ b/balanceXonotic.cfg
@@ -162,6 +162,7 @@ set g_projectiles_damage 2
 // 0: only damage from contents (lava/slime) or exceptions 
 // 1: only self damage or damage from contents or exceptions
 // 2: allow all damage to projectiles normally
+set g_projectiles_keep_owner 0
 set g_projectiles_newton_style 2
 // possible values:
 // 0: absolute velocity projectiles (like Quake)

diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index 5e1c65f796e159525962b01e0cd69074475710f8..dbb790a883b9c131d1b3aa18c6458abba2e7873a 100644 (file)
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -928,6 +928,7 @@ float autocvar_g_playerclip_collisions;
 string autocvar_g_playerstats_uri;
 float autocvar_g_powerups;
 float autocvar_g_projectiles_damage;
+float autocvar_g_projectiles_keep_owner;
 float autocvar_g_projectiles_newton_style;
 float autocvar_g_projectiles_newton_style_2_maxfactor;
 float autocvar_g_projectiles_newton_style_2_minfactor;

diff --git a/qcsrc/server/w_common.qc b/qcsrc/server/w_common.qc
index 1cd8b812cee7e1bc324b824d964459269820bd9d..f288702dae2886668d4629dac6c62351fcca3945 100644 (file)
--- a/qcsrc/server/w_common.qc
+++ b/qcsrc/server/w_common.qc
@@ -588,7 +588,7 @@ void W_PrepareExplosionByDamage(entity attacker, void() explode)
        self.takedamage = DAMAGE_NO;
        self.event_damage = SUB_Null;
        
-       if not(g_ca)
+       if((attacker.flags & FL_CLIENT) && !autocvar_g_projectiles_keep_owner)
        {
                self.owner = attacker;
                self.realowner = attacker;