From 20e5e22c9d917b66c543120fd0dee9b3a5e7b373 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Sun, 15 May 2011 21:24:37 +0200 Subject: [PATCH] more ent_cs fixes --- qcsrc/client/Main.qc | 4 ---- qcsrc/client/shownames.qc | 2 +- qcsrc/server/ent_cs.qc | 8 +------- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc index 8820c06d7..bac1fdaef 100644 --- 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 a87404cf3..28d0d161e 100644 --- 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 0763785bc..3ffcb3b38 100644 --- 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; -- 2.39.2