X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fcommon%2Fent_cs.qh;h=aa689e59d707684eda169334528faf49cce8eefe;hb=90ac5f4f1f4aa420546283c58953f387b82e33ba;hp=1546d7da49ab6aab437ac464c95789048ddcf331;hpb=991de5e6922cd3c283de56c3249624f0f1bfe767;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/ent_cs.qh b/qcsrc/common/ent_cs.qh
index 1546d7da4..aa689e59d 100644
--- a/qcsrc/common/ent_cs.qh
+++ b/qcsrc/common/ent_cs.qh
@@ -1,7 +1,7 @@
 #pragma once
 
 #ifdef CSQC
-#include <client/defs.qh>
+#include <client/csqcmodel_hooks.qh>
 #endif
 
 REGISTER_NET_LINKED(ENT_CLIENT_ENTCS)
@@ -12,9 +12,6 @@ REGISTER_NET_TEMP(CLIENT_ENTCS)
 .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 */
@@ -47,6 +44,10 @@ REGISTER_NET_TEMP(CLIENT_ENTCS)
 
 	void entcs_force_origin(entity player);
 
+	void entcs_update_players(entity player);
+
+	bool radar_showenemies;
+
 #endif
 
 #ifdef CSQC
@@ -78,7 +79,7 @@ REGISTER_NET_TEMP(CLIENT_ENTCS)
 	{
 		bool unconnected = !playerslots[i].gotscores;
 		entity e = entcs_receiver(i);
-		int fr = ((e) ? e.frags : stof(getplayerkeyvalue(i, "frags")));
+		int fr = ((e) ? e.frags : 0);
 		if (unconnected || fr == FRAGS_SPECTATOR)
 			return ENTCS_SPEC_PURE;
 		int sol = ((e) ? e.sv_solid : SOLID_NOT);
@@ -93,7 +94,7 @@ REGISTER_NET_TEMP(CLIENT_ENTCS)
 	int entcs_GetClientColors(int i)
 	{
 		entity e = entcs_receiver(i);
-		return e ? e.colormap : stof(getplayerkeyvalue(i, "colors"));
+		return e ? e.colormap : 0;
 	}
 
 	/**
@@ -129,7 +130,7 @@ REGISTER_NET_TEMP(CLIENT_ENTCS)
 	string entcs_GetName(int i)
 	{
 		entity e = entcs_receiver(i);
-		return ColorTranslateRGB(e ? e.netname : getplayerkeyvalue(i, "name"));
+		return e ? ColorTranslateRGB(e.netname) : "";
 	}
 
     /**