X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=data%2Fqcsrc%2Fserver%2Fent_cs.qc;h=687e9d544a7ebc14c577dd070ce70c31ef04676d;hb=248cf47b022caea9730cae1a8d13ca1dfbfe5db3;hp=dfb8a4066dfa3159e373ba98a5f7677a25102482;hpb=3dde891885635b59381a73f32a624932ae30b90a;p=voretournament%2Fvoretournament.git

diff --git a/data/qcsrc/server/ent_cs.qc b/data/qcsrc/server/ent_cs.qc
index dfb8a406..687e9d54 100644
--- a/data/qcsrc/server/ent_cs.qc
+++ b/data/qcsrc/server/ent_cs.qc
@@ -30,10 +30,6 @@ float entcs_customize()
 		return FALSE;
 	if(other == o)
 		return FALSE;
-	if(other.classname == "player")
-		if(!teamplay || o.team != other.team)
-			if not (radar_showennemies)
-				return FALSE;
 	return TRUE;
 }
 
@@ -52,17 +48,17 @@ float entcs_send(entity to, float sf)
 	if(sf & 4)
 		WriteByte(MSG_ENTITY, self.angles_y * 256.0 / 360);
 	if(sf & 8)
-		WriteByte(MSG_ENTITY, self.health / 10); // FIXME use a better scale?
+		WriteShort(MSG_ENTITY, self.health);
 	if(sf & 16)
-		WriteByte(MSG_ENTITY, self.armorvalue / 10); // FIXME use a better scale?
+		WriteShort(MSG_ENTITY, self.armorvalue);
 	if(sf & 32)
-		WriteByte(MSG_ENTITY, num_for_edict(self.predator));
+		WriteByte(MSG_ENTITY, self.stat_eaten);
 	return TRUE;
 };
 
 void entcs_think()
 {
-	self.nextthink = time + 0.01;
+	self.nextthink = time + 0.03;
 
 	entity o;
 	o = self.owner;
@@ -87,9 +83,9 @@ void entcs_think()
 		self.armorvalue = o.armorvalue;
 		self.SendFlags |= 16;
 	}
-	if(o.predator != self.predator)
+	if(o.stat_eaten != self.stat_eaten)
 	{
-		self.predator = o.predator;
+		self.stat_eaten = o.stat_eaten;
 		self.SendFlags |= 32;
 	}
 };