X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fent_cs.qh;h=1546d7da49ab6aab437ac464c95789048ddcf331;hp=1c72b351f7ff7e4e65b48fd9e5bf599f86c11a40;hb=3ac61b98c83be079c61cf525491d2028b2a889dc;hpb=eac60648c4017e495060dd3ba9e50ac4bad5000a

diff --git a/qcsrc/common/ent_cs.qh b/qcsrc/common/ent_cs.qh
index 1c72b351f..1546d7da4 100644
--- a/qcsrc/common/ent_cs.qh
+++ b/qcsrc/common/ent_cs.qh
@@ -1,15 +1,26 @@
-#ifndef ENT_CS_H
-#define ENT_CS_H
+#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
 /*
@@ -28,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,10 +69,31 @@ REGISTER_NET_TEMP(CLIENT_ENTCS)
 	/**
      * @param i zero indexed player
      */
-	bool entcs_IsSpectating(int i)
+    .int frags;
+	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;
-		return unconnected || stof(getplayerkeyvalue(i, "frags")) == FRAGS_SPECTATOR;
+		entity e = entcs_receiver(i);
+		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;
+	}
+
+	/**
+     * @param i zero indexed player
+     */
+	int entcs_GetClientColors(int i)
+	{
+		entity e = entcs_receiver(i);
+		return e ? e.colormap : stof(getplayerkeyvalue(i, "colors"));
 	}
 
 	/**
@@ -71,16 +102,15 @@ REGISTER_NET_TEMP(CLIENT_ENTCS)
 	*/
 	int entcs_GetTeamColor(int i)
 	{
-		return (!teamplay) ? 0 : stof(getplayerkeyvalue(i, "colors")) & 15;
+		return (!teamplay) ? 0 : entcs_GetClientColors(i) & 15;
 	}
 
 	/**
 	* @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);
 	}
 
 	/**
@@ -98,7 +128,8 @@ REGISTER_NET_TEMP(CLIENT_ENTCS)
 	*/
 	string entcs_GetName(int i)
 	{
-		return ColorTranslateRGB(getplayerkeyvalue(i, "name"));
+		entity e = entcs_receiver(i);
+		return ColorTranslateRGB(e ? e.netname : getplayerkeyvalue(i, "name"));
 	}
 
     /**
@@ -127,7 +158,7 @@ REGISTER_NET_TEMP(CLIENT_ENTCS)
 		       ? '1 1 1'
 			   : colormapPaletteColor(((e.colormap >= 1024)
 			? e.colormap
-			: stof(getplayerkeyvalue(e.colormap - 1, "colors"))) & 15, true)
+			: entcs_GetClientColors(e.colormap - 1)) & 15, true)
 		;
 	}
 
@@ -141,5 +172,3 @@ REGISTER_NET_TEMP(CLIENT_ENTCS)
 	}
 
 #endif
-
-#endif