X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fent_cs.qh;h=0180fea784793f921036cf52bc4a2a91a1ad0aa1;hb=c4bce6d9a493a84cce1c213e4f85d4c47e2ee11e;hp=0d02e4b538e3f789981118358500052609b3399e;hpb=57755aea0cb5ac02b6aa56949ad9ac1beabced0a;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/ent_cs.qh b/qcsrc/common/ent_cs.qh
index 0d02e4b53..0180fea78 100644
--- a/qcsrc/common/ent_cs.qh
+++ b/qcsrc/common/ent_cs.qh
@@ -1,13 +1,21 @@
-#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)
 
 /** 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;
 
@@ -26,7 +34,7 @@ REGISTER_NET_TEMP(CLIENT_ENTCS)
 
 	bool entcs_send(entity this, entity to, int sf);
 
-	void entcs_think();
+	void entcs_think(entity this);
 
 	void entcs_attach(entity e);
 
@@ -59,10 +67,21 @@ REGISTER_NET_TEMP(CLIENT_ENTCS)
 	/**
      * @param i zero indexed player
      */
+    .int frags;
 	bool entcs_IsSpectating(int i)
 	{
 		bool unconnected = !playerslots[i].gotscores;
-		return unconnected || stof(getplayerkeyvalue(i, "frags")) == FRAGS_SPECTATOR;
+		entity e = entcs_receiver(i);
+		return unconnected || ((e) ? e.frags : stof(getplayerkeyvalue(i, "frags"))) == FRAGS_SPECTATOR;
+	}
+
+	/**
+     * @param i zero indexed player
+     */
+	int entcs_GetClientColors(int i)
+	{
+		entity e = entcs_receiver(i);
+		return e ? e.colormap : stof(getplayerkeyvalue(i, "colors"));
 	}
 
 	/**
@@ -71,7 +90,7 @@ 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;
 	}
 
 	/**
@@ -98,7 +117,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 +147,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 +161,3 @@ REGISTER_NET_TEMP(CLIENT_ENTCS)
 	}
 
 #endif
-
-#endif