X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fent_cs.qc;h=0eeddc349bce72d747f55d2b1f3b8b3251ca7d50;hb=1017a955336ffea041442a10138486f16f8273f1;hp=cafef4868b540cd274de8d2f253fd113a6d43623;hpb=3220cab5a7b69ced4a641504a6a5f4eccf2d3bfc;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/ent_cs.qc b/qcsrc/common/ent_cs.qc
index cafef4868..0eeddc349 100644
--- a/qcsrc/common/ent_cs.qc
+++ b/qcsrc/common/ent_cs.qc
@@ -1,80 +1,122 @@
 #include "ent_cs.qh"
 
-// #define PROP(public, fld, sv, cl)
-#define ENTCS_NETPROPS(PROP) \
-	PROP(true, sv_entnum, \
-	{ WriteByte(chan, etof(player) - 1); }, \
-	{ this.sv_entnum = ReadByte(); }) \
-    \
-	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); }) \
-    \
-	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, health, \
-	{ WriteByte(chan, bound(0, this.health / 10, 255));  /* FIXME: use a better scale? */ }, \
-	{ this.healthvalue = ReadByte() * 10; }) \
-    \
-	PROP(false, armorvalue, \
-	{ WriteByte(chan, bound(0, this.armorvalue / 10, 255));  /* FIXME: use a better scale? */ }, \
-	{ this.armorvalue = ReadByte() * 10; }) \
-    \
-	PROP(true, netname, \
-	{ WriteString(chan, this.netname); }, \
-	{ if (this.netname) strunzone(this.netname); this.netname = strzone(ReadString()); }) \
-    \
-	PROP(true, model, \
-	{ WriteString(chan, this.model); }, \
-	{ if (this.model) strunzone(this.model); this.model = strzone(ReadString()); }) \
-    \
-	PROP(true, skin, \
-	{ WriteByte(chan, this.skin); }, \
-	{ this.skin = ReadByte(); }) \
-    \
-	/**/
+REGISTRY(EntCSProps, BITS(16) - 1)
+#define EntCSProps_from(i) _EntCSProps_from(i, NULL)
+REGISTER_REGISTRY(EntCSProps)
+REGISTRY_SORT(EntCSProps)
+REGISTRY_CHECK(EntCSProps)
+STATIC_INIT(RegisterEntCSProps_renumber) { FOREACH(EntCSProps, true, it.m_id = i); }
+
+.bool m_public;
+.bool(entity ent, entity player) m_check;
+.void(entity ent, entity player) m_set;
+.void(int chan, entity ent) m_send;
+.void(entity ent) m_receive;
+
+#ifdef SVQC
+#define ENTCS_PROP(id, ispublic, checkprop, setprop, svsend, clreceive) \
+	bool id##_check(entity ent, entity player) { return (ent.(checkprop) != player.(checkprop)); } \
+	void id##_set(entity ent, entity player) { setprop(ent.(checkprop), player.(checkprop)); } \
+	void id##_send(int chan, entity ent) { LAMBDA(svsend); } \
+	REGISTER(EntCSProps, ENTCS_PROP, id, m_id, new_pure(entcs_prop)) { \
+		this.m_public = ispublic; \
+		this.m_check = id##_check; \
+		this.m_set = id##_set; \
+		this.m_send = id##_send; \
+	}
+#elif defined(CSQC)
+#define ENTCS_PROP(id, ispublic, checkprop, setprop, svsend, clreceive) \
+	void id##_receive(entity ent) { LAMBDA(clreceive); } \
+	REGISTER(EntCSProps, ENTCS_PROP, id, m_id, new_pure(entcs_prop)) { \
+		this.m_public = ispublic; \
+		this.m_receive = id##_receive; \
+	}
+#endif
+
+#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 \
+	strcpy(var, x); \
+MACRO_END
+
+ENTCS_PROP(ENTNUM, false, sv_entnum, ENTCS_SET_NORMAL, {}, {}) /* sentinel */
+
+ENTCS_PROP(ORIGIN, false, origin, ENTCS_SET_NORMAL,
+	{ WriteVector(chan, ent.origin); },
+	{ ent.has_sv_origin = true; vector v = ReadVector(); setorigin(ent, v); })
+
+ENTCS_PROP(ANGLES, 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; })
+
+ENTCS_PROP(HEALTH, false, health, ENTCS_SET_NORMAL,
+	{ WriteByte(chan, bound(0, ent.health / 10, 255));  /* FIXME: use a better scale? */ },
+	{ ent.healthvalue = ReadByte() * 10; })
+
+ENTCS_PROP(ARMOR, false, armorvalue, ENTCS_SET_NORMAL,
+	{ WriteByte(chan, bound(0, ent.armorvalue / 10, 255));  /* FIXME: use a better scale? */ },
+	{ ent.armorvalue = ReadByte() * 10; })
+
+ENTCS_PROP(NAME, true, netname, ENTCS_SET_MUTABLE_STRING,
+	{ WriteString(chan, ent.netname); },
+	{ strcpy(ent.netname, ReadString()); })
+
+ENTCS_PROP(MODEL, true, model, ENTCS_SET_NORMAL,
+	{ WriteString(chan, ent.model); },
+	{ strcpy(ent.model, ReadString()); })
+
+ENTCS_PROP(SKIN, true, skin, ENTCS_SET_NORMAL,
+	{ WriteByte(chan, ent.skin); },
+	{ ent.skin = ReadByte(); })
+
+ENTCS_PROP(CLIENTCOLORS, true, clientcolors, ENTCS_SET_NORMAL,
+	{ WriteByte(chan, ent.clientcolors); },
+	{ ent.colormap = ReadByte(); })
+
+ENTCS_PROP(FRAGS, true, frags, ENTCS_SET_NORMAL,
+	{ WriteShort(chan, ent.frags); },
+	{ ent.frags = ReadShort(); })
 
 #ifdef SVQC
 
 	int ENTCS_PUBLICMASK = 0;
 	STATIC_INIT(ENTCS_PUBLICMASK)
 	{
-		int i = 1;
-		#define X(public, fld, sv, cl) { if (public) ENTCS_PUBLICMASK |= BIT(i); } i += 1;
-		ENTCS_NETPROPS(X);
-	#undef X
-		if (i >= BITS(16 - 1)) LOG_FATAL("Exceeded ENTCS_NETPROPS limit");
+		FOREACH(EntCSProps, it.m_public,
+		{
+			ENTCS_PUBLICMASK |= BIT(it.m_id);
+		});
 	}
 
 	bool _entcs_send(entity this, entity to, int sf, int chan)
 	{
 		entity player = this.owner;
-		sf |= BIT(0) | BIT(1);
-		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
-		}
+		sf |= BIT(0); // assume private
+		do {
+			if (IS_PLAYER(player))
+			{
+				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 =
-		    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
 			WriteHeader(chan, CLIENT_ENTCS);
 		WriteByte(chan, etof(player) - 1);
 		WriteShort(chan, sf);
-		int i = 1;
-		#define X(public, fld, sv, cl) { if (sf & BIT(i)) sv; } i += 1;
-		ENTCS_NETPROPS(X);
-	#undef X
+		FOREACH(EntCSProps, sf & BIT(it.m_id),
+		{
+			it.m_send(chan, this);
+		});
 		return true;
 	}
 
@@ -87,16 +129,11 @@
 	{
 		this.nextthink = time + 0.033333333333;  // TODO: increase this to like 0.15 once the client can do smoothing
 		entity o = this.owner;
-		int i = 1;
-		#define X(public, fld, sv, cl) \
-			if (o.fld != this.fld) \
-			{ \
-				this.fld = o.fld; \
-				this.SendFlags |= BIT(i); \
-			} \
-			i += 1;
-		ENTCS_NETPROPS(X);
-	#undef X
+		FOREACH(EntCSProps, it.m_check(this, o),
+		{
+			it.m_set(this, o);
+			this.SendFlags |= BIT(it.m_id);
+		});
 	    setorigin(this, this.origin);  // relink
 	}
 
@@ -117,7 +154,7 @@
 	void entcs_detach(entity player)
 	{
 		if (!player.entcs) return;
-		remove(player.entcs);
+		delete(player.entcs);
 		player.entcs = NULL;
 	}
 
@@ -130,7 +167,9 @@
 		int n = this.sv_entnum;
 		entity e = entcs_receiver(n);
 		entcs_receiver(n, NULL);
-		if (e != this) remove(e);
+		strfree(e.netname);
+		strfree(e.model);
+		if (e != this) delete(e);
 	}
 
 	void entcs_think(entity this)
@@ -146,8 +185,7 @@
 		// `cl_forceplayermodels 1` sounds will be wrong until the player has been in the PVS, but so be it
 		if (this.model != e.model)
 		{
-			if (this.model) strunzone(this.model);
-			this.model = strzone(e.model);
+			strcpy(this.model, e.model);
 		}
 	}
 
@@ -157,37 +195,36 @@
 		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));
-		int i = 1;
-		#define X(public, fld, sv, cl) { if (sf & BIT(i)) cl; } i += 1;
-		ENTCS_NETPROPS(X);
-	#undef X
-		this.iflags |= IFLAG_ORIGIN;
-		InterpolateOrigin_Note(this);
-		getthink(this)(this);
+		e.has_sv_origin = false;
+		e.m_entcs_private = boolean(sf & BIT(0));
+		FOREACH(EntCSProps, sf & BIT(it.m_id),
+		{
+			it.m_receive(e);
+		});
+		e.iflags |= IFLAG_ORIGIN;
+		InterpolateOrigin_Note(e);
+		getthink(e)(e);
 		return true;
 	}