From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sun, 3 Apr 2011 21:16:50 +0000 (+0300)
Subject: Fix another bug with dead bodies. Also set the .owner entity of dead bodies to the... 
X-Git-Tag: xonotic-v0.6.0~110^2^2~140
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6c7347874801aaced1cb034e6f4c9aed8847f9a1;p=xonotic%2Fxonotic-data.pk3dir.git

Fix another bug with dead bodies. Also set the .owner entity of dead bodies to the player, which should be useful for other possible features.
---

diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc
index 58924ed77..468b6a0bb 100644
--- a/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@ -148,6 +148,7 @@ void CopyBody(float keepvelocity)
 
 	Violence_DamageEffect_Copy(oldself, self);
 
+	self.owner = oldself;
 	self = oldself;
 }
 
diff --git a/qcsrc/server/g_violence.qc b/qcsrc/server/g_violence.qc
index cee0c28a6..82b521364 100644
--- a/qcsrc/server/g_violence.qc
+++ b/qcsrc/server/g_violence.qc
@@ -82,7 +82,13 @@ void Violence_DamageEffect(entity pl, float type)
 	e.classname = "weapondamage";
 	e.cnt = type;
 	e.state |= 8 * pl.species; // gib type, ranges from 0 to 15
-	e.team = num_for_edict(pl);
+
+	// if this is a dead body, send the num of its player
+	if(pl.classname == "body")
+		e.team = num_for_edict(pl.owner);
+	else
+		e.team = num_for_edict(pl);
+
 	setorigin(e, pl.origin);
 
 	Net_LinkEntity(e, FALSE, 0.2, Violence_DamageEffect_SendEntity);