From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sun, 10 Apr 2011 20:45:25 +0000 (+0300)
Subject: Remove that trick to send dead bodies. It likely won't work as I expect it to. Don... 
X-Git-Tag: xonotic-v0.6.0~110^2^2~112
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6fa8fe7d92f365c6066f31655aea592640e2c583;p=xonotic%2Fxonotic-data.pk3dir.git

Remove that trick to send dead bodies. It likely won't work as I expect it to. Don't know how I'm going to do it in the end...
---

diff --git a/qcsrc/client/gibs.qc b/qcsrc/client/gibs.qc
index af5864d79..7239fffe2 100644
--- a/qcsrc/client/gibs.qc
+++ b/qcsrc/client/gibs.qc
@@ -281,7 +281,6 @@ void GibSplash_Precache()
 void Ent_DamageEffect()
 {
 	float type, specnum1, specnum2, entnumber;
-	float is_body;
 	vector org;
 	string specstr, effectnum;
 	entity e;
@@ -300,15 +299,6 @@ void Ent_DamageEffect()
 
 	e = get_weaponinfo(type);
 
-	if(specnum1 >= 16)
-	{
-		// The server sends the specnum increased by 16 when the target is a dead body (a trick used to save bandwidth)
-		// Species range from 0 to 15, so 16 could never be reached, and may be used for other info.
-		// Revert the species back and mark that this is a dead body.
-		specnum1 -= 16;
-		is_body = TRUE;
-	}
-
 	specnum2 = (specnum1 & 0x78) / 8; // blood type: using four bits (0..7, bit indexes 3,4,5)
 	specstr = species_prefix(specnum2);
 
diff --git a/qcsrc/server/g_violence.qc b/qcsrc/server/g_violence.qc
index f8ed4fe0d..0cc997bb0 100644
--- a/qcsrc/server/g_violence.qc
+++ b/qcsrc/server/g_violence.qc
@@ -81,14 +81,7 @@ void Violence_DamageEffect(entity pl, float type)
 
 	// if this is a copied dead body, send the num of its player instead
 	if(pl.classname == "body")
-	{
 		e.team = num_for_edict(pl.owner);
-
-		// Use a trick to indicate this is a copied dead body and not an alive player to the client (saves an extra WriteByte).
-		// Do this by increasing species with 16. Species range from 0 to 15, so 16 could never be reached, and may be used for other info.
-		// The client will notice this and turn them back, while also noting what the server is trying to say.
-		e.state += 16;
-	}
 	else
 		e.team = num_for_edict(pl);