Merge remote branch 'origin/master' into fruitiex/animations

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / ent_cs.qc

diff --git a/qcsrc/server/ent_cs.qc b/qcsrc/server/ent_cs.qc
index 0a477b1b4d5298738f52c5c778cc7cdf3d8aa839..9c4bf59758770d4fc6f90f6abcf3560a21e27081 100644 (file)
--- a/qcsrc/server/ent_cs.qc
+++ b/qcsrc/server/ent_cs.qc
@@ -31,7 +31,7 @@ float entcs_customize()
        if(other == o)
                return FALSE;
        if(other.classname == "player")
-               if(o.team != other.team)
+               if(!teamplay || o.team != other.team)
                        if not (radar_showennemies)
                                return FALSE;
        return TRUE;
@@ -39,15 +39,10 @@ float entcs_customize()
 
 float entcs_send(entity to, float sf)
 {
-       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)
-               WriteByte(MSG_ENTITY, num_for_edict(self.owner));
+               WriteByte(MSG_ENTITY, num_for_edict(self.owner)-1);
        if(sf & 2)
        {
                WriteShort(MSG_ENTITY, self.origin_x);
@@ -65,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;