Attach entcs to the client state

[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 ac06dc4788ff0eb0d403075c1a747dba8a62e105..3a9f084bcf7cfd8188a48534ce3c9bd0f4432619 100644 (file)
--- a/qcsrc/common/ent_cs.qh
+++ b/qcsrc/common/ent_cs.qh
@@ -1,12 +1,21 @@
 #pragma once
 
+#ifdef CSQC
+#include <client/defs.qh>
+#endif
+
 REGISTER_NET_LINKED(ENT_CLIENT_ENTCS)
 REGISTER_NET_TEMP(CLIENT_ENTCS)
 
 /** 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;
 
@@ -34,7 +43,7 @@ REGISTER_NET_TEMP(CLIENT_ENTCS)
        .int m_forceupdate;
 
 /** Force an origin update, for player sounds */
-       #define entcs_force_origin(e) ((e).entcs.m_forceupdate = BIT(2))
+       #define entcs_force_origin(e) (CS(e).entcs.m_forceupdate = BIT(2))
 
 #endif
 
@@ -68,17 +77,6 @@ REGISTER_NET_TEMP(CLIENT_ENTCS)
 
        /**
      * @param i zero indexed player
-     */
-    .int frags;
-       bool entcs_IsEliminated(int i)
-       {
-               bool unconnected = !playerslots[i].gotscores;
-               entity e = entcs_receiver(i);
-               return unconnected || ((e) ? e.frags : stof(getplayerkeyvalue(i, "frags"))) == FRAGS_LMS_LOSER;
-       }
-
-       /**
-     * @param i zero indexed player
      */
        int entcs_GetClientColors(int i)
        {