entcs: fix networking of wrong entcs fields (nevertheless miraculously it was working...

[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 65cdd83d3a71f4f5df325a8e90b727d936cb1300..c46d31b12b5b597577232717c14b542ea0805951 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;
 
@@ -27,14 +36,13 @@ REGISTER_NET_TEMP(CLIENT_ENTCS)
 
        void entcs_think(entity this);
 
-       void entcs_attach(entity e);
+       void entcs_attach(entity player);
 
-       void entcs_detach(entity e);
+       void entcs_detach(entity player);
 
        .int m_forceupdate;
 
-/** Force an origin update, for player sounds */
-       #define entcs_force_origin(e) ((e).entcs.m_forceupdate = BIT(2))
+       void entcs_force_origin(entity player);
 
 #endif