X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fent_cs.qh;h=8c5259fcdd37b8a788a04448868181231729fcda;hb=8141387a9bf057652453a8d4dc530116cf4cc31a;hp=db0dc466ba9144c076f9f60284e5366c68055645;hpb=8b40f064c770021af83bbb36c48f9cd1f366e0b1;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/ent_cs.qh b/qcsrc/common/ent_cs.qh
index db0dc466b..8c5259fcd 100644
--- a/qcsrc/common/ent_cs.qh
+++ b/qcsrc/common/ent_cs.qh
@@ -18,6 +18,7 @@ REGISTER_NET_TEMP(CLIENT_ENTCS)
 .bool has_sv_origin;
 #endif
 .int sv_solid;
+.int activewepid; // z411
 
 #ifdef SVQC
 /*
@@ -71,6 +72,7 @@ REGISTER_NET_TEMP(CLIENT_ENTCS)
      * @param i zero indexed player
      */
     .int frags;
+    .int wants_join;
 	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))
@@ -79,7 +81,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);
@@ -90,11 +92,20 @@ REGISTER_NET_TEMP(CLIENT_ENTCS)
 
 	/**
      * @param i zero indexed player
+     */
+	int entcs_GetWantsJoin(int i)
+	{
+		entity e = entcs_receiver(i);
+		return e.wants_join;
+	}
+
+	/**
+     * @param i zero indexed player
      */
 	int entcs_GetClientColors(int i)
 	{
 		entity e = entcs_receiver(i);
-		return e ? e.colormap : stof(getplayerkeyvalue(i, "colors"));
+		return e ? e.colormap : 0;
 	}
 
 	/**
@@ -130,7 +141,19 @@ 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) : "";
+	}
+	
+	int entcs_GetCountryCode(int i)
+	{
+		entity e = entcs_receiver(i);
+		return e.countrycode;
+	}
+	
+	string entcs_GetRank(int i)
+	{
+		entity e = entcs_receiver(i);
+		return e.rank;
 	}
 
     /**