X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fent_cs.qc;h=af9a73ecaed21e347608e137aa2ec52b6ccd5d81;hb=5abe7760e8867f0e6001991049795a3da07813a0;hp=3ffcb3b3868aa23f16e7628ab816fbb75a5a1ea7;hpb=6e0a2fc04c5f95920d1f64a76f7f96c1e7d1f505;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/ent_cs.qc b/qcsrc/server/ent_cs.qc index 3ffcb3b38..af9a73eca 100644 --- a/qcsrc/server/ent_cs.qc +++ b/qcsrc/server/ent_cs.qc @@ -18,7 +18,7 @@ void entcs_init() { print("Initializing ClientSide information entities\n"); -}; +} float entcs_customize() { @@ -30,8 +30,8 @@ float entcs_customize() return FALSE; if(other == o) return FALSE; - if(other.classname == "player") - if(!teams_matter || o.team != other.team) + if((other.classname == "player") || other.caplayer) + if(!teamplay || o.team != other.team) if not (radar_showennemies) return FALSE; return TRUE; @@ -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? return TRUE; -}; +} void entcs_think() { @@ -85,11 +85,11 @@ void entcs_think() self.armorvalue = o.armorvalue; self.SendFlags |= 16; } -}; +} entity attach_entcs() { - local entity ent; + entity ent; ent = spawn(); ent.classname = "entcs_sender_v2"; @@ -103,10 +103,10 @@ entity attach_entcs() self.entcs = ent; return ent; -}; +} void detach_entcs() { remove(self.entcs); self.entcs = world; -}; +}