X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fent_cs.qc;h=b84a98ca6d3c9d1f723eec988d7cb89bb2de9918;hb=0b99147bcc0f85125c26df79e410a6db12fad70c;hp=777bd417a6d2607a0e252dc3bbc3933b4b9b0462;hpb=6cf8d564903730469971f6e7dbc37cc5d84f6a7a;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/ent_cs.qc b/qcsrc/common/ent_cs.qc
index 777bd417a..b84a98ca6 100644
--- a/qcsrc/common/ent_cs.qc
+++ b/qcsrc/common/ent_cs.qc
@@ -2,12 +2,12 @@
 
 #if defined(CSQC)
 	#include <common/gamemodes/_mod.qh>
-	#include <common/resources.qh>
+	#include <common/resources/resources.qh>
 #elif defined(MENUQC)
 #elif defined(SVQC)
 	#include <common/gamemodes/_mod.qh>
-	#include <common/resources.qh>
-	#include <server/resources.qh>
+	#include <common/resources/resources.qh>
+	#include <common/resources/sv_resources.qh>
 #endif
 
 REGISTRY(EntCSProps, BITS(16) - 1)
@@ -115,7 +115,7 @@ ENTCS_PROP(ORIGIN, false, origin, origin, ENTCS_SET_NORMAL,
 	{ WriteVector(chan, ent.origin); },
 	{ ent.has_sv_origin = true; vector v = ReadVector(); setorigin(ent, v); })
 
-#define DEC_FACTOR (360 / 32)
+#define DEC_FACTOR (360 / 64)
 ENTCS_PROP_CODED(ANGLES, false, angles_y, angles_y, ENTCS_SET_NORMAL, DEC_FACTOR,
 	{ WriteByte(chan, ent.angles.y / DEC_FACTOR); },
 	{ vector v = '0 0 0'; v.y = ReadByte() * DEC_FACTOR; ent.angles = v; })
@@ -157,14 +157,30 @@ ENTCS_PROP(SOLID, true, sv_solid, solid, ENTCS_SET_NORMAL,
 	{ WriteByte(chan, ent.sv_solid); },
 	{ ent.sv_solid = ReadByte(); })
 
+// gamemode specific player survival status (independent of score and frags)
+ENTCS_PROP(SURVIVAL_STATUS, true, survival_status, survival_status, ENTCS_SET_NORMAL,
+	{ WriteShort(chan, ent.survival_status); },
+	{ ent.survival_status = ReadShort(); })
+
 #ifdef SVQC
 
-	int ENTCS_PUBLICMASK = 0;
+	int ENTCS_PUBLICMASK = 0, ENTCS_PRIVATEMASK = 0;
 	STATIC_INIT(ENTCS_PUBLICMASK)
 	{
-		FOREACH(EntCSProps, it.m_public,
+		FOREACH(EntCSProps, true,
+		{
+			if (it.m_public)
+				ENTCS_PUBLICMASK |= BIT(it.m_id);
+			else
+				ENTCS_PRIVATEMASK |= BIT(it.m_id);
+		});
+	}
+
+	void entcs_update_players(entity player)
+	{
+		FOREACH_CLIENT(it != player && IS_PLAYER(it),
 		{
-			ENTCS_PUBLICMASK |= BIT(it.m_id);
+			CS(it).entcs.SendFlags |= ENTCS_PRIVATEMASK;
 		});
 	}
 
@@ -177,7 +193,7 @@ ENTCS_PROP(SOLID, true, sv_solid, solid, ENTCS_SET_NORMAL,
 			{
 				if (radar_showenemies) break;
 				if (SAME_TEAM(to, player)) break;
-				if (!(IS_PLAYER(to) || to.caplayer) && time > game_starttime) break;
+				if (!(IS_PLAYER(to) || INGAME(to))) break;
 			}
 			sf &= ENTCS_PUBLICMASK; // no private updates
 		} while (0);
@@ -211,17 +227,26 @@ ENTCS_PROP(SOLID, true, sv_solid, solid, ENTCS_SET_NORMAL,
 			it.m_set(this, player);
 			this.SendFlags |= BIT(it.m_id);
 		});
+
 		if (intermission_running)
 		{
 			// health is set to special values after the game ends, ignore any change
 			this.SendFlags &= ~BIT(ENTCS_PROP_HEALTH_id);
 		}
-		setorigin(this, this.origin); // relink
+
+		// always send origin of players even if they stand still otherwise
+		// if a teammate isn't in my pvs and their health (or view angle or name
+		// etc...) changes then their tag disappears
+		if (IS_PLAYER(this.owner))
+			this.SendFlags |= BIT(ENTCS_PROP_ORIGIN_id);
+
+		// not needed, origin is just data to be sent
+		//setorigin(this, this.origin); // relink
 	}
 
 	void entcs_attach(entity player)
 	{
-		entity e = CS(player).entcs = new(entcs_sender);
+		entity e = CS(player).entcs = new_pure(entcs_sender);
 		e.owner = player;
 		setthink(e, entcs_think);
 		e.nextthink = time;
@@ -262,11 +287,17 @@ ENTCS_PROP(SOLID, true, sv_solid, solid, ENTCS_SET_NORMAL,
 		entity e = CSQCModel_server2csqc(this.sv_entnum);
 		if (e == NULL)
 		{
+			// player model is NOT in client's PVS
+			InterpolateOrigin_Do(this);
 			this.has_origin = this.has_sv_origin;
 			return;
 		}
 		this.has_origin = true;
+		// when a player model is in client's PVS we use its origin directly
+		// (entcs networked origin is overriden)
 		this.origin = e.origin;
+		InterpolateOrigin_Reset(this);
+		setorigin(this, this.origin);
 		// `cl_forceplayermodels 1` sounds will be wrong until the player has been in the PVS, but so be it
 		if (this.model != e.model)
 		{