Merge branch 'master' into z411/bai-server

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / ent_cs.qh

diff --git a/qcsrc/common/ent_cs.qh b/qcsrc/common/ent_cs.qh
index 8ae89fd3b6c49707e06a958ea31ae1700159a8b6..8c5259fcdd37b8a788a04448868181231729fcda 100644 (file)
--- a/qcsrc/common/ent_cs.qh
+++ b/qcsrc/common/ent_cs.qh
@@ -12,15 +12,13 @@ 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 */
 .bool has_sv_origin;
 #endif
 .int sv_solid;
+.int activewepid; // z411
 
 #ifdef SVQC
 /*
@@ -47,6 +45,8 @@ REGISTER_NET_TEMP(CLIENT_ENTCS)
 
        void entcs_force_origin(entity player);
 
+       void entcs_update_players(entity player);
+
        bool radar_showenemies;
 
 #endif
@@ -72,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))
@@ -80,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);
@@ -91,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;
        }
 
        /**
@@ -131,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;
        }
 
     /**