X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fent_cs.qc;h=71052bd2b7fdbf256aaf2d034ec2490801e9657c;hb=429e52163f53e75b848135f076b77c4eb43935ac;hp=5b48ef668d0b443141c82435e863fb60c14996ac;hpb=a8dce9a6a0da041f1e3fe598cd190464bf9ea07e;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/ent_cs.qc b/qcsrc/common/ent_cs.qc
index 5b48ef668..71052bd2b 100644
--- a/qcsrc/common/ent_cs.qc
+++ b/qcsrc/common/ent_cs.qc
@@ -1,43 +1,53 @@
 #include "ent_cs.qh"
 
-// #define PROP(public, fld, sv, cl)
-#define ENTCS_NETPROPS(PROP) PROP(false, sv_entnum, {}, {}) /* sentinel */ \
-	PROP(false, origin, \
-	{ WriteShort(chan, this.origin.x);  WriteShort(chan, this.origin.y); \
-	  WriteShort(chan, this.origin.z); }, \
-	{ this.has_sv_origin = true; vector v; v.x = ReadShort(); v.y = ReadShort(); v.z = ReadShort(); setorigin(this, v); }) \
+#define ENTCS_SET_NORMAL(var, x) MACRO_BEGIN \
+	var = x; \
+MACRO_END
+
+/** the engine player name strings are mutable! */
+#define ENTCS_SET_MUTABLE_STRING(var, x) MACRO_BEGIN \
+	if (var) strunzone(var); \
+	var = strzone(x); \
+MACRO_END
+
+// #define PROP(public, fld, set, sv, cl)
+#define ENTCS_NETPROPS(ent, PROP) PROP(false, sv_entnum, ENTCS_SET_NORMAL, {}, {}) /* sentinel */ \
+	PROP(false, origin, ENTCS_SET_NORMAL, \
+	{ WriteShort(chan, ent.origin.x);  WriteShort(chan, ent.origin.y); \
+	  WriteShort(chan, ent.origin.z); }, \
+	{ ent.has_sv_origin = true; vector v; v.x = ReadShort(); v.y = ReadShort(); v.z = ReadShort(); setorigin(ent, v); }) \
     \
-	PROP(false, angles_y, \
-	{ WriteByte(chan, this.angles.y / 360 * 256); }, \
-	{ vector v = '0 0 0'; v.y = ReadByte() / 256 * 360; this.angles = v; }) \
+	PROP(false, angles_y, ENTCS_SET_NORMAL, \
+	{ WriteByte(chan, ent.angles.y / 360 * 256); }, \
+	{ vector v = '0 0 0'; v.y = ReadByte() / 256 * 360; ent.angles = v; }) \
     \
-	PROP(false, health, \
-	{ WriteByte(chan, bound(0, this.health / 10, 255));  /* FIXME: use a better scale? */ }, \
-	{ this.healthvalue = ReadByte() * 10; }) \
+	PROP(false, health, ENTCS_SET_NORMAL, \
+	{ WriteByte(chan, bound(0, ent.health / 10, 255));  /* FIXME: use a better scale? */ }, \
+	{ ent.healthvalue = ReadByte() * 10; }) \
     \
-	PROP(false, armorvalue, \
-	{ WriteByte(chan, bound(0, this.armorvalue / 10, 255));  /* FIXME: use a better scale? */ }, \
-	{ this.armorvalue = ReadByte() * 10; }) \
+	PROP(false, armorvalue, ENTCS_SET_NORMAL, \
+	{ WriteByte(chan, bound(0, ent.armorvalue / 10, 255));  /* FIXME: use a better scale? */ }, \
+	{ ent.armorvalue = ReadByte() * 10; }) \
     \
-	PROP(true, netname, \
-	{ WriteString(chan, this.netname); }, \
-	{ if (this.netname) strunzone(this.netname); this.netname = strzone(ReadString()); }) \
+	PROP(true, netname, ENTCS_SET_MUTABLE_STRING, \
+	{ WriteString(chan, ent.netname); }, \
+	{ if (ent.netname) strunzone(ent.netname); ent.netname = strzone(ReadString()); }) \
     \
-	PROP(true, model, \
-	{ WriteString(chan, this.model); }, \
-	{ if (this.model) strunzone(this.model); this.model = strzone(ReadString()); }) \
+	PROP(true, model, ENTCS_SET_NORMAL, \
+	{ WriteString(chan, ent.model); }, \
+	{ if (ent.model) strunzone(ent.model); ent.model = strzone(ReadString()); }) \
     \
-	PROP(true, skin, \
-	{ WriteByte(chan, this.skin); }, \
-	{ this.skin = ReadByte(); }) \
+	PROP(true, skin, ENTCS_SET_NORMAL, \
+	{ WriteByte(chan, ent.skin); }, \
+	{ ent.skin = ReadByte(); }) \
     \
-    PROP(true, clientcolors, \
-	{ WriteByte(chan, this.clientcolors); }, \
-	{ this.colormap = ReadByte(); }) \
+    PROP(true, clientcolors, ENTCS_SET_NORMAL, \
+	{ WriteByte(chan, ent.clientcolors); }, \
+	{ ent.colormap = ReadByte(); }) \
     \
-    PROP(true, frags, \
-	{ WriteShort(chan, this.frags); }, \
-	{ this.frags = ReadShort(); }) \
+    PROP(true, frags, ENTCS_SET_NORMAL, \
+	{ WriteShort(chan, ent.frags); }, \
+	{ ent.frags = ReadShort(); }) \
     \
 	/**/
 
@@ -47,13 +57,13 @@
 	STATIC_INIT(ENTCS_PUBLICMASK)
 	{
 		int i = 0;
-		#define X(public, fld, sv, cl) { \
+		#define X(public, fld, set, sv, cl) { \
 			if (public) { \
 				ENTCS_PUBLICMASK |= BIT(i); \
 			} \
 			i += 1; \
 		}
-		ENTCS_NETPROPS(X);
+		ENTCS_NETPROPS(this, X);
 	#undef X
 		if (i >= BITS(16 - 1)) LOG_FATAL("Exceeded ENTCS_NETPROPS limit");
 	}
@@ -62,18 +72,19 @@
 	{
 		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 (!(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;
+			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
@@ -81,13 +92,13 @@
 		WriteByte(chan, etof(player) - 1);
 		WriteShort(chan, sf);
 		int i = 0;
-		#define X(public, fld, sv, cl) { \
+		#define X(public, fld, set, sv, cl) { \
 			if (sf & BIT(i)) { \
 				sv; \
 			} \
 			i += 1; \
 		}
-		ENTCS_NETPROPS(X);
+		ENTCS_NETPROPS(this, X);
 	#undef X
 		return true;
 	}
@@ -102,14 +113,14 @@
 		this.nextthink = time + 0.033333333333;  // TODO: increase this to like 0.15 once the client can do smoothing
 		entity o = this.owner;
 		int i = 0;
-		#define X(public, fld, sv, cl) { \
+		#define X(public, fld, set, sv, cl) { \
 			if (o.fld != this.fld) { \
-				this.fld = o.fld; \
+				set(this.fld, o.fld); \
 				this.SendFlags |= BIT(i); \
 			} \
 			i += 1; \
 		}
-		ENTCS_NETPROPS(X);
+		ENTCS_NETPROPS(this, X);
 	#undef X
 	    setorigin(this, this.origin);  // relink
 	}
@@ -171,42 +182,41 @@
 		entity e = entcs_receiver(n);
 		if (e == NULL)
 		{
-			if (this)
-			{
-				e = this;
-			}
+			if (!this)
+				// initial = temp
+				e = new_pure(entcs_receiver);
 			else
-			{
-				e = new(entcs_receiver);
-				make_pure(e);
-			}
-			e.sv_entnum = n;
+				// initial = linked
+				e = this;
 			setthink(e, entcs_think);
 			entcs_receiver(n, e);
 		}
-		else if (this && e != this)
+		else if (e != this && this)
 		{
-			this.classname = "entcs_gc";
-			this.sv_entnum = n;
+			// upgrade to linked
+			delete(e);
+			e = this;
+			setthink(e, entcs_think);
+			entcs_receiver(n, e);
 		}
-		this = e;
-		InterpolateOrigin_Undo(this);
-		this.sv_entnum = n;
+
+		InterpolateOrigin_Undo(e);
+		e.sv_entnum = n;
 		int sf = ReadShort();
-		this.has_sv_origin = false;
-		this.m_entcs_private = boolean(sf & BIT(0));
+		e.has_sv_origin = false;
+		e.m_entcs_private = boolean(sf & BIT(0));
 		int i = 0;
-		#define X(public, fld, sv, cl) { \
+		#define X(public, fld, set, sv, cl) { \
 			if (sf & BIT(i)) { \
 				cl; \
 			} \
 			i += 1; \
 		}
-		ENTCS_NETPROPS(X);
+		ENTCS_NETPROPS(e, X);
 	#undef X
-		this.iflags |= IFLAG_ORIGIN;
-		InterpolateOrigin_Note(this);
-		getthink(this)(this);
+		e.iflags |= IFLAG_ORIGIN;
+		InterpolateOrigin_Note(e);
+		getthink(e)(e);
 		return true;
 	}