X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fent_cs.qh;h=1546d7da49ab6aab437ac464c95789048ddcf331;hb=65ba38c5228d8af26ac2b04b6e6e536a1772f446;hp=598ff0514254cde55dbaaec51fefe7075576cc9d;hpb=2d79d9ed30444579f4a1e3205280eec945201b9f;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/ent_cs.qh b/qcsrc/common/ent_cs.qh
index 598ff0514..1546d7da4 100644
--- a/qcsrc/common/ent_cs.qh
+++ b/qcsrc/common/ent_cs.qh
@@ -1,16 +1,29 @@
-#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 a recent origin is available */
+/** 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
-/**
+/*
  * The point of these entities is to avoid the problems
  * with clientprediction.
  * If you add SendEntity to players, the engine will not
@@ -20,30 +33,142 @@ REGISTER_NET_LINKED(ENT_CLIENT_ENTCS)
  * in onslaught... YAY ;)
  */
 
-.entity entcs;
-
-bool entcs_customize();
+	.entity entcs;
 
-bool entcs_send(entity this, entity to, int sf);
+	bool entcs_send(entity this, entity to, int sf);
 
-void entcs_think();
+	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;
+	.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
 
 #ifdef CSQC
 
-entity entcs_receiver[255]; // 255 is the engine limit on maxclients
-#define entcs_is_self(e) ((e).sv_entnum + 1 == player_localentnum)
-
-#endif
+	ArrayList _entcs;
+	STATIC_INIT(_entcs)
+	{
+		AL_NEW(_entcs, 255, NULL, e);  // 255 is the engine limit on maxclients
+	}
+	SHUTDOWN(_entcs)
+	{
+		AL_DELETE(_entcs);
+	}
+	#define entcs_receiver(...) EVAL_entcs_receiver(OVERLOAD(entcs_receiver, __VA_ARGS__))
+	#define EVAL_entcs_receiver(...) __VA_ARGS__
+	#define entcs_receiver_1(i) AL_gete(_entcs, i)
+	#define entcs_receiver_2(i, v) AL_sete(_entcs, i, v)
+	#define entcs_is_self(e) ((e).sv_entnum == player_localentnum - 1)
+
+	/**
+     * @param i zero indexed player
+     */
+    .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;
+		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"));
+	}
+
+	/**
+	* @param i zero indexed player
+	* @returns 0 if not teamplay
+	*/
+	int entcs_GetTeamColor(int i)
+	{
+		return (!teamplay) ? 0 : entcs_GetClientColors(i) & 15;
+	}
+
+	/**
+	* @param i zero indexed player
+	*/
+	int entcs_GetTeam(int i)
+	{
+		return (entcs_GetSpecState(i) == ENTCS_SPEC_PURE) ? NUM_SPECTATOR : entcs_GetTeamColor(i);
+	}
+
+	/**
+	 * Same as `entcs_GetTeam`, but returns -1 for no team in teamplay
+	 */
+	int entcs_GetScoreTeam(int i)
+	{
+		int t = entcs_GetTeam(i);
+		if (teamplay && !t) t = -1;
+		return t;
+	}
+
+	/**
+	* @param i zero indexed player
+	*/
+	string entcs_GetName(int i)
+	{
+		entity e = entcs_receiver(i);
+		return ColorTranslateRGB(e ? e.netname : getplayerkeyvalue(i, "name"));
+	}
+
+    /**
+     * @param i zero indexed player
+     */
+	entity CSQCModel_server2csqc(int i);
+
+    .float alpha;
+
+    /**
+     * @param i zero indexed player
+     */
+	float entcs_GetAlpha(int i)
+	{
+		entity e = CSQCModel_server2csqc(i);
+		return e ? e.alpha : 1;
+	}
+
+    /**
+     * @param i zero indexed player
+     */
+	vector entcs_GetColor(int i)
+	{
+		entity e = CSQCModel_server2csqc(i);
+		return (!e || e.colormap <= 0)
+		       ? '1 1 1'
+			   : colormapPaletteColor(((e.colormap >= 1024)
+			? e.colormap
+			: entcs_GetClientColors(e.colormap - 1)) & 15, true)
+		;
+	}
+
+    /**
+     * @param i zero indexed player
+     */
+	bool entcs_IsDead(int i)
+	{
+		entity e = CSQCModel_server2csqc(i);
+		return e ? e.csqcmodel_isdead : false;
+	}
 
 #endif