X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fent_cs.qc;h=17ee08e7cf14937037696112f4a7edf941c2ab4e;hb=05620b234d2481a49e0441457dd64c4b4a8ca9d8;hp=dbadc9abbd6eabe1ff1a5bbd8539bd0d247577a5;hpb=724a41faf2cbfd86d41f3ab59ff8326a831a8326;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/ent_cs.qc b/qcsrc/common/ent_cs.qc
index dbadc9abb..17ee08e7c 100644
--- a/qcsrc/common/ent_cs.qc
+++ b/qcsrc/common/ent_cs.qc
@@ -1,39 +1,53 @@
 #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, \
+#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(PROP) PROP(false, sv_entnum, ENTCS_SET_NORMAL, {}, {}) /* sentinel */ \
+	PROP(false, origin, ENTCS_SET_NORMAL, \
 	{ 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, \
+	PROP(false, angles_y, ENTCS_SET_NORMAL, \
 	{ WriteByte(chan, this.angles.y / 360 * 256); }, \
 	{ vector v = '0 0 0'; v.y = ReadByte() / 256 * 360; this.angles = v; }) \
     \
-	PROP(false, health, \
+	PROP(false, health, ENTCS_SET_NORMAL, \
 	{ WriteByte(chan, bound(0, this.health / 10, 255));  /* FIXME: use a better scale? */ }, \
 	{ this.healthvalue = ReadByte() * 10; }) \
     \
-	PROP(false, armorvalue, \
+	PROP(false, armorvalue, ENTCS_SET_NORMAL, \
 	{ WriteByte(chan, bound(0, this.armorvalue / 10, 255));  /* FIXME: use a better scale? */ }, \
 	{ this.armorvalue = ReadByte() * 10; }) \
     \
-	PROP(true, netname, \
+	PROP(true, netname, ENTCS_SET_MUTABLE_STRING, \
 	{ WriteString(chan, this.netname); }, \
 	{ if (this.netname) strunzone(this.netname); this.netname = strzone(ReadString()); }) \
     \
-	PROP(true, model, \
+	PROP(true, model, ENTCS_SET_NORMAL, \
 	{ WriteString(chan, this.model); }, \
 	{ if (this.model) strunzone(this.model); this.model = strzone(ReadString()); }) \
     \
-	PROP(true, skin, \
+	PROP(true, skin, ENTCS_SET_NORMAL, \
 	{ WriteByte(chan, this.skin); }, \
 	{ this.skin = ReadByte(); }) \
+    \
+    PROP(true, clientcolors, ENTCS_SET_NORMAL, \
+	{ WriteByte(chan, this.clientcolors); }, \
+	{ this.colormap = ReadByte(); }) \
+    \
+    PROP(true, frags, ENTCS_SET_NORMAL, \
+	{ WriteShort(chan, this.frags); }, \
+	{ this.frags = ReadShort(); }) \
     \
 	/**/
 
@@ -42,8 +56,13 @@
 	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;
+		int i = 0;
+		#define X(public, fld, set, 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");
@@ -52,27 +71,28 @@
 	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 (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;
+		int i = 0;
+		#define X(public, fld, set, sv, cl) { \
+			if (sf & BIT(i)) { \
+				sv; \
+			} \
+			i += 1; \
+		}
 		ENTCS_NETPROPS(X);
 	#undef X
 		return true;
@@ -83,42 +103,41 @@
 		return _entcs_send(this, to, sf, MSG_ENTITY);
 	}
 
-	void entcs_think()
+	void entcs_think(entity this)
 	{
-		SELFPARAM();
 		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; \
+		int i = 0;
+		#define X(public, fld, set, sv, cl) { \
+			if (o.fld != this.fld) { \
+				set(this.fld, o.fld); \
 				this.SendFlags |= BIT(i); \
 			} \
-			i += 1;
+			i += 1; \
+		}
 		ENTCS_NETPROPS(X);
 	#undef X
+	    setorigin(this, this.origin);  // relink
 	}
 
 	void entcs_attach(entity player)
 	{
 		entity e = player.entcs = new(entcs_sender);
-		make_pure(e);
 		e.owner = player;
-		e.think = entcs_think;
+		setthink(e, entcs_think);
 		e.nextthink = time;
 		Net_LinkEntity(e, false, 0, entcs_send);
 		if (!IS_REAL_CLIENT(player)) return;
-		FOREACH_CLIENT(true, LAMBDA(
+		FOREACH_CLIENT(true, {
 			assert(it.entcs);
 			_entcs_send(it.entcs, msg_entity = player, BITS(23), MSG_ONE);
-		));
+		});
 	}
 
 	void entcs_detach(entity player)
 	{
 		if (!player.entcs) return;
-		remove(player.entcs);
+		delete(player.entcs);
 		player.entcs = NULL;
 	}
 
@@ -131,12 +150,11 @@
 		int n = this.sv_entnum;
 		entity e = entcs_receiver(n);
 		entcs_receiver(n, NULL);
-		if (e != this) remove(e);
+		if (e != this) delete(e);
 	}
 
-	void entcs_think()
+	void entcs_think(entity this)
 	{
-		SELFPARAM();
 		entity e = CSQCModel_server2csqc(this.sv_entnum);
 		if (e == NULL)
 		{
@@ -157,39 +175,50 @@
 	{
 		int n = ReadByte();
 		entity e = entcs_receiver(n);
+		#define X(e) { \
+			setthink(e, entcs_think); \
+			entcs_receiver(n, e); \
+		}
 		if (e == NULL)
 		{
-			if (this)
+			if (!this)
 			{
-				e = this;
+				// initial = temp
+				e = new_pure(entcs_receiver);
+				X(e);
 			}
 			else
 			{
-				e = new(entcs_receiver);
-				make_pure(e);
+				// initial = linked
+				e = this;
+				X(e);
 			}
-			e.sv_entnum = n;
-			e.think = 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;
+			X(e);
 		}
-		this = e;
-		InterpolateOrigin_Undo(this);
-		this.sv_entnum = n;
+		#undef X
+		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;
+		e.has_sv_origin = false;
+		e.m_entcs_private = boolean(sf & BIT(0));
+		int i = 0;
+		#define X(public, fld, set, sv, cl) { \
+			if (sf & BIT(i)) { \
+				cl; \
+			} \
+			i += 1; \
+		}
 		ENTCS_NETPROPS(X);
 	#undef X
-		this.iflags |= IFLAG_ORIGIN;
-		InterpolateOrigin_Note(this);
-		WITH(entity, self, this, this.think());
+		e.iflags |= IFLAG_ORIGIN;
+		InterpolateOrigin_Note(e);
+		getthink(e)(e);
 		return true;
 	}