From: Rudolf Polzer <divverent@xonotic.org>
Date: Wed, 23 May 2012 07:45:15 +0000 (+0200)
Subject: cvar: g_projectiles_keep_owner (keep owner when projectile is damaged), was previousl... 
X-Git-Tag: xonotic-v0.7.0~314^2~4^2~3
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=d9e2fd37287bf13c47f30f97520d01b03bedb224;p=xonotic%2Fxonotic-data.pk3dir.git

cvar: g_projectiles_keep_owner (keep owner when projectile is damaged), was previously controlled by g_ca for no reason; never allow a projectile's owner to become world or a non-player; fixes #1226
---

diff --git a/balance25.cfg b/balance25.cfg
index bea9ad263..aafb163b4 100644
--- 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 16286fe0f..1bb898912 100644
--- 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 d3478a969..759551d8d 100644
--- 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 b7dbd3db8..52c8a74d8 100644
--- 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 5e1c65f79..dbb790a88 100644
--- 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 1cd8b812c..f288702da 100644
--- 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;