From 7b2bd8ac3bdb1c3ac3a9849aea8e56133fd824c1 Mon Sep 17 00:00:00 2001 From: terencehill Date: Sat, 7 Jan 2017 19:47:01 +0100 Subject: [PATCH] Small simplification --- qcsrc/common/ent_cs.qc | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/qcsrc/common/ent_cs.qc b/qcsrc/common/ent_cs.qc index 5a5c6acbe..419bbb6a1 100644 --- a/qcsrc/common/ent_cs.qc +++ b/qcsrc/common/ent_cs.qc @@ -64,7 +64,7 @@ MACRO_END i += 1; \ } ENTCS_NETPROPS(this, X); - #undef X + #undef X if (i >= BITS(16 - 1)) LOG_FATAL("Exceeded ENTCS_NETPROPS limit"); } @@ -73,16 +73,15 @@ MACRO_END entity player = this.owner; sf |= BIT(0); // assume private do { - if (!(IS_PLAYER(player))) + if (IS_PLAYER(player)) { - sf &= ENTCS_PUBLICMASK; // no private updates - break; + if (radar_showennemies) break; + if (SAME_TEAM(to, player)) break; + if (!(IS_PLAYER(to) || to.caplayer) && time > game_starttime) break; } - if (radar_showennemies) break; - if (SAME_TEAM(to, player)) break; - if (!(IS_PLAYER(to) || to.caplayer) && time > game_starttime) break; sf &= ENTCS_PUBLICMASK; // no private updates } while (0); + sf |= this.m_forceupdate; this.m_forceupdate = 0; if (chan == MSG_ENTITY) @@ -99,7 +98,7 @@ MACRO_END i += 1; \ } ENTCS_NETPROPS(this, X); - #undef X + #undef X return true; } @@ -121,7 +120,7 @@ MACRO_END i += 1; \ } ENTCS_NETPROPS(this, X); - #undef X + #undef X setorigin(this, this.origin); // relink } @@ -213,7 +212,7 @@ MACRO_END i += 1; \ } ENTCS_NETPROPS(e, X); - #undef X + #undef X e.iflags |= IFLAG_ORIGIN; InterpolateOrigin_Note(e); getthink(e)(e); -- 2.39.2