X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fent_cs.qh;h=1546d7da49ab6aab437ac464c95789048ddcf331;hp=65cdd83d3a71f4f5df325a8e90b727d936cb1300;hb=e0012447bfce1b551df3dc01b043655aa93dafad;hpb=7f042267d93f57719b68f0725af14d444f5c8932

diff --git a/qcsrc/common/ent_cs.qh b/qcsrc/common/ent_cs.qh
index 65cdd83d3a..1546d7da49 100644
--- a/qcsrc/common/ent_cs.qh
+++ b/qcsrc/common/ent_cs.qh
@@ -1,14 +1,26 @@
 #pragma once
 
+#ifdef CSQC
+#include <client/defs.qh>
+#endif
+
 REGISTER_NET_LINKED(ENT_CLIENT_ENTCS)
 REGISTER_NET_TEMP(CLIENT_ENTCS)
 
+#ifdef CSQC
 /** True when private information such as origin is available */
 .bool m_entcs_private;
+
 /** True when origin is available */
+// FIXME: it seems sometimes this is false when observing even though observers should be able to know about all players
+// easily reproducible on heart_v2 or The_Yard with bots - might be because they lack waypoints and bots stand still
+// it has happened in matches with players and no bots but much more rarely
 .bool has_origin;
+
 /** True when a recent server sent origin has been received */
 .bool has_sv_origin;
+#endif
+.int sv_solid;
 
 #ifdef SVQC
 /*
@@ -27,14 +39,13 @@ REGISTER_NET_TEMP(CLIENT_ENTCS)
 
 	void entcs_think(entity this);
 
-	void entcs_attach(entity e);
+	void entcs_attach(entity player);
 
-	void entcs_detach(entity e);
+	void entcs_detach(entity player);
 
 	.int m_forceupdate;
 
-/** Force an origin update, for player sounds */
-	#define entcs_force_origin(e) ((e).entcs.m_forceupdate = BIT(2))
+	void entcs_force_origin(entity player);
 
 #endif
 
@@ -59,11 +70,21 @@ REGISTER_NET_TEMP(CLIENT_ENTCS)
      * @param i zero indexed player
      */
     .int frags;
-	bool entcs_IsSpectating(int i)
+	const int ENTCS_SPEC_PURE = 1; // real spectator
+	const int ENTCS_SPEC_IN_SCOREBOARD = 2; // spectator but still in game (can be in a team)
+	#define entcs_IsSpectating(i) boolean(entcs_GetSpecState(i))
+
+	int entcs_GetSpecState(int i)
 	{
 		bool unconnected = !playerslots[i].gotscores;
 		entity e = entcs_receiver(i);
-		return unconnected || ((e) ? e.frags : stof(getplayerkeyvalue(i, "frags"))) == FRAGS_SPECTATOR;
+		int fr = ((e) ? e.frags : stof(getplayerkeyvalue(i, "frags")));
+		if (unconnected || fr == FRAGS_SPECTATOR)
+			return ENTCS_SPEC_PURE;
+		int sol = ((e) ? e.sv_solid : SOLID_NOT);
+		if (fr == FRAGS_PLAYER_OUT_OF_GAME && sol == SOLID_NOT)
+			return ENTCS_SPEC_IN_SCOREBOARD;
+		return 0;
 	}
 
 	/**
@@ -86,11 +107,10 @@ REGISTER_NET_TEMP(CLIENT_ENTCS)
 
 	/**
 	* @param i zero indexed player
-	* @returns 0 if not teamplay | NUM_TEAM_##N | NUM_SPECTATOR
 	*/
 	int entcs_GetTeam(int i)
 	{
-		return entcs_IsSpectating(i) ? NUM_SPECTATOR : entcs_GetTeamColor(i);
+		return (entcs_GetSpecState(i) == ENTCS_SPEC_PURE) ? NUM_SPECTATOR : entcs_GetTeamColor(i);
 	}
 
 	/**