more ent_cs fixes

diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc
index 8820c06d7ea2597fb3d9e993d85de89d177e227c..bac1fdaef9c2719bf3c0438f6f5af51e1aeec43a 100644 (file)
--- a/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@ -683,10 +683,6 @@ void Ent_ReadEntCS()
                self.healthvalue = ReadByte() * 10;
        if(sf & 16)
                self.armorvalue = ReadByte() * 10;
-       if(sf & 128) // same team
-               self.sameteam = TRUE;
-       else
-               self.sameteam = FALSE;
 
        entcs_receiver[self.sv_entnum] = self;
        self.entremove = Ent_RemoveEntCS;

diff --git a/qcsrc/client/shownames.qc b/qcsrc/client/shownames.qc
index a87404cf3444e299811da2ed46a9bc847a90b799..28d0d161eb3453108a9d854fbff1562f06fc0bed 100644 (file)
--- a/qcsrc/client/shownames.qc
+++ b/qcsrc/client/shownames.qc
@@ -172,7 +172,7 @@ void Draw_ShowNames_All()
                {
                        e.healthvalue = entcs.healthvalue;
                        e.armorvalue = entcs.armorvalue;
-                       e.sameteam = (teamplay && (t == myteam));
+                       e.sameteam = 1; /* (teamplay && (t == myteam)); */
                }
                else
                {

diff --git a/qcsrc/server/ent_cs.qc b/qcsrc/server/ent_cs.qc
index 0763785bc0cd996a6ffb1b7551ec442e18fb4413..3ffcb3b3868aa23f16e7628ab816fbb75a5a1ea7 100644 (file)
--- a/qcsrc/server/ent_cs.qc
+++ b/qcsrc/server/ent_cs.qc
@@ -39,12 +39,6 @@ float entcs_customize()
 
 float entcs_send(entity to, float sf)
 {
-       // a simple safeguard, should not REALLY be needed
-       sf |= 128;
-       if(teams_matter && !radar_showennemies)
-               if(to.team != self.team)
-                       sf &~= (8 | 16 | 128); // don't send h/a for enemies
-
        WriteByte(MSG_ENTITY, ENT_CLIENT_ENTCS);
        WriteByte(MSG_ENTITY, sf);
        if(sf & 1)
@@ -66,7 +60,7 @@ float entcs_send(entity to, float sf)
 
 void entcs_think()
 {
-       self.nextthink = time;
+       self.nextthink = time + 0.033333333333; // increase this to like 0.15 once the client can do smoothing
 
        entity o;
        o = self.owner;