From: terencehill <piuntn@gmail.com>
Date: Sat, 7 Jan 2017 18:47:01 +0000 (+0100)
Subject: Small simplification
X-Git-Tag: xonotic-v0.8.2~313
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7b2bd8ac3bdb1c3ac3a9849aea8e56133fd824c1;p=xonotic%2Fxonotic-data.pk3dir.git

Small simplification
---

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);