From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sat, 9 Jul 2011 00:04:17 +0000 (+0300)
Subject: Send / receive the predator entnum instead
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=3dde891885635b59381a73f32a624932ae30b90a;p=voretournament%2Fvoretournament.git

Send / receive the predator entnum instead
---

diff --git a/data/qcsrc/client/Main.qc b/data/qcsrc/client/Main.qc
index 48e137c9..e7fd1ea2 100644
--- a/data/qcsrc/client/Main.qc
+++ b/data/qcsrc/client/Main.qc
@@ -687,7 +687,7 @@ void Ent_ReadEntCS()
 	if(sf & 16)
 		self.armorvalue = ReadByte() * 10;
 	if(sf & 32)
-		self.eaten = ReadByte();
+		self.predator = ReadByte();
 
 	entcs_receiver[self.sv_entnum] = self;
 	self.entremove = Ent_RemoveEntCS;
diff --git a/data/qcsrc/client/shownames.qc b/data/qcsrc/client/shownames.qc
index 37bd0bfc..fac602ee 100644
--- a/data/qcsrc/client/shownames.qc
+++ b/data/qcsrc/client/shownames.qc
@@ -14,7 +14,7 @@ void Draw_ShowNames(entity ent)
 	if(ent.sv_entnum == player_localentnum && !cvar("chase_active"))
 		return;
 
-	if(ent.eaten) // don't show names for prey
+	if(ent.predator) // don't show names for prey
 		return;
 
 	if(ent.sameteam || (!ent.sameteam && cvar("hud_shownames_enemies")))
@@ -171,14 +171,14 @@ void Draw_ShowNames_All()
 			e.healthvalue = entcs.healthvalue;
 			e.armorvalue = entcs.armorvalue;
 			e.sameteam = 1; /* (teamplay && (t == myteam)); */
-			e.eaten = entcs.eaten;
+			e.predator = entcs.predator;
 		}
 		else
 		{
 			e.healthvalue = 2342;
 			e.armorvalue = 0;
 			e.sameteam = 0;
-			e.eaten = 0;
+			e.predator = 0;
 		}
 
 		e.origin = getplayerorigin(i);
diff --git a/data/qcsrc/client/shownames.qh b/data/qcsrc/client/shownames.qh
index fbd20f02..0509dd3e 100644
--- a/data/qcsrc/client/shownames.qh
+++ b/data/qcsrc/client/shownames.qh
@@ -1,4 +1,4 @@
 .float healthvalue;
 .float armorvalue;
-.float eaten;
+.float predator;
 .float sameteam;
diff --git a/data/qcsrc/server/ent_cs.qc b/data/qcsrc/server/ent_cs.qc
index 9f564b4e..dfb8a406 100644
--- a/data/qcsrc/server/ent_cs.qc
+++ b/data/qcsrc/server/ent_cs.qc
@@ -56,7 +56,7 @@ float entcs_send(entity to, float sf)
 	if(sf & 16)
 		WriteByte(MSG_ENTITY, self.armorvalue / 10); // FIXME use a better scale?
 	if(sf & 32)
-		WriteByte(MSG_ENTITY, self.stat_eaten);
+		WriteByte(MSG_ENTITY, num_for_edict(self.predator));
 	return TRUE;
 };
 
@@ -87,9 +87,9 @@ void entcs_think()
 		self.armorvalue = o.armorvalue;
 		self.SendFlags |= 16;
 	}
-	if(o.stat_eaten != self.stat_eaten)
+	if(o.predator != self.predator)
 	{
-		self.stat_eaten = o.stat_eaten;
+		self.predator = o.predator;
 		self.SendFlags |= 32;
 	}
 };