From: TimePath <andrew.hardaker1995@gmail.com>
Date: Sun, 28 Aug 2016 08:36:21 +0000 (+1000)
Subject: entcs: accept updates before game_starttime
X-Git-Tag: xonotic-v0.8.2~656
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=df47e4c692dfbbd0b93d8dae2522025906d7360b;p=xonotic%2Fxonotic-data.pk3dir.git

entcs: accept updates before game_starttime
---

diff --git a/qcsrc/common/ent_cs.qc b/qcsrc/common/ent_cs.qc
index 24440b61e..dc8a68e31 100644
--- a/qcsrc/common/ent_cs.qc
+++ b/qcsrc/common/ent_cs.qc
@@ -62,18 +62,14 @@
 	{
 		entity player = this.owner;
 		sf |= BIT(0); // assume private
-		if (IS_PLAYER(to) || to.caplayer) {                                // unless spectating,
-			bool same_team = (to == player) || (teamplay && player.team == to.team);
-			if (!same_team && !radar_showennemies) sf &= ENTCS_PUBLICMASK; // no private updates
-		}
+		do {
+			if (radar_showennemies) break;
+			if ((to == player) || (teamplay && player.team == to.team)) 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;
-		bool valid =
-			time > game_starttime
-		    && (IS_PLAYER(player)          // player must be active
-		    || player == to)               // player is self
-		;
-		if (!valid) sf = 0;
 		if (chan == MSG_ENTITY)
 			WriteHeader(chan, ENT_CLIENT_ENTCS);
 		else