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 e44ccdabbe897511371c8d5b4cbacf22491f120f..0b65c08cbb25c512b116938216b3b8a651168221 100644 (file)
--- a/qcsrc/common/ent_cs.qh
+++ b/qcsrc/common/ent_cs.qh
@@ -1,23 +1,24 @@
 #pragma once
 
 #ifdef CSQC
-#include <client/defs.qh>
+#include <client/csqcmodel_hooks.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 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
 /*
@@ -44,6 +45,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 +83,7 @@ REGISTER_NET_TEMP(CLIENT_ENTCS)
                int fr = ((e) ? e.frags : stof(getplayerkeyvalue(i, "frags")));
                if (unconnected || fr == FRAGS_SPECTATOR)
                        return ENTCS_SPEC_PURE;
-               int sol = ((e) ? e.solid : SOLID_NOT);
+               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;
@@ -128,6 +133,12 @@ REGISTER_NET_TEMP(CLIENT_ENTCS)
                entity e = entcs_receiver(i);
                return ColorTranslateRGB(e ? e.netname : getplayerkeyvalue(i, "name"));
        }
+       
+       int entcs_GetCountryCode(int i)
+       {
+               entity e = entcs_receiver(i);
+               return e.countrycode;
+       }
 
     /**
      * @param i zero indexed player