X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fent_cs.qh;h=0d02e4b538e3f789981118358500052609b3399e;hp=8122ccdc0ee543ad913594b6384c697efe665971;hb=bf28c62f9ad2f130024109354c2503457195898d;hpb=71ce27cd515d7e8157535466ef357f83253b64f0

diff --git a/qcsrc/common/ent_cs.qh b/qcsrc/common/ent_cs.qh
index 8122ccdc0..0d02e4b53 100644
--- a/qcsrc/common/ent_cs.qh
+++ b/qcsrc/common/ent_cs.qh
@@ -50,7 +50,8 @@ REGISTER_NET_TEMP(CLIENT_ENTCS)
 	{
 		AL_DELETE(_entcs);
 	}
-	#define entcs_receiver(...) EVAL(OVERLOAD(entcs_receiver, __VA_ARGS__))
+	#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)
@@ -82,6 +83,16 @@ REGISTER_NET_TEMP(CLIENT_ENTCS)
 		return entcs_IsSpectating(i) ? 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
 	*/