Do not send entcs for prey. This saves us from having to check the predator client...

diff --git a/data/qcsrc/client/Main.qc b/data/qcsrc/client/Main.qc
index 6e731232c8ec3639d439858ac040af8e5e6acdcf..90dce734b673441ad82db7c2dcb771a03272f977 100644 (file)
--- a/data/qcsrc/client/Main.qc
+++ b/data/qcsrc/client/Main.qc
@@ -686,8 +686,6 @@ void Ent_ReadEntCS()
                self.healthvalue = ReadShort();\r
        if(sf & 16)\r
                self.armorvalue = ReadShort();\r
-       if(sf & 32)\r
-               self.predator = ReadByte();\r
 \r
        entcs_receiver[self.sv_entnum] = self;\r
        self.entremove = Ent_RemoveEntCS;\r

diff --git a/data/qcsrc/client/shownames.qc b/data/qcsrc/client/shownames.qc
index c0cd6e8fd309003cfb6079eabafe1a5509494b38..f00e9a407dc9c8c647bfc9751a069c8f17522744 100644 (file)
--- a/data/qcsrc/client/shownames.qc
+++ b/data/qcsrc/client/shownames.qc
@@ -13,9 +13,6 @@ void Draw_ShowNames(entity ent)
        if(ent.sv_entnum == player_localentnum && !cvar("chase_active"))
                return;
 
-       if(ent.predator) // don't show names for prey
-               return;
-
        float sameteam;
        if(teamplay && (GetPlayerColor(player_localentnum - 1) == GetPlayerColor(ent.sv_entnum - 1)))
                sameteam = TRUE;
@@ -168,13 +165,11 @@ void Draw_ShowNames_All()
                {
                        e.healthvalue = entcs.healthvalue;
                        e.armorvalue = entcs.armorvalue;
-                       e.predator = entcs.predator;
                }
                else
                {
                        e.healthvalue = 2342;
                        e.armorvalue = 0;
-                       e.predator = 0;
                }
 
                e.origin = getplayerorigin(i);

diff --git a/data/qcsrc/client/shownames.qh b/data/qcsrc/client/shownames.qh
index 630f8e2eb2447582f7e0323c68b3b6df1e11898b..62aaae2be1b0692f861de061a1b6c1daa756148f 100644 (file)
--- a/data/qcsrc/client/shownames.qh
+++ b/data/qcsrc/client/shownames.qh
@@ -1,3 +1,2 @@
 .float healthvalue;
 .float armorvalue;
-.float predator;

diff --git a/data/qcsrc/server/ent_cs.qc b/data/qcsrc/server/ent_cs.qc
index 733c449cd7b66892d7932fcde66f49e013e48a4d..0743388fc5dd6fa201f367fd87c27ffe142953db 100644 (file)
--- a/data/qcsrc/server/ent_cs.qc
+++ b/data/qcsrc/server/ent_cs.qc
@@ -30,6 +30,8 @@ float entcs_customize()
                return FALSE;\r
        if(other == o)\r
                return FALSE;\r
+       if(o.stat_eaten)\r
+               return FALSE;\r
        return TRUE;\r
 }\r
 \r
@@ -51,8 +53,6 @@ float entcs_send(entity to, float sf)
                WriteShort(MSG_ENTITY, self.health);\r
        if(sf & 16)\r
                WriteShort(MSG_ENTITY, self.armorvalue);\r
-       if(sf & 32)\r
-               WriteByte(MSG_ENTITY, num_for_edict(self.predator));\r
        return TRUE;\r
 };\r
 \r
@@ -83,11 +83,6 @@ void entcs_think()
                self.armorvalue = o.armorvalue;\r
                self.SendFlags |= 16;\r
        }\r
-       if(o.predator != self.predator)\r
-       {\r
-               self.predator = o.predator;\r
-               self.SendFlags |= 32;\r
-       }\r
 };\r
 \r
 entity attach_entcs()\r