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

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

diff --git a/qcsrc/common/ent_cs.qc b/qcsrc/common/ent_cs.qc
index e0d983b963e1bb7def1c228398325af687541e20..a15ebc2966323ac468d95c9e910036d5d58b0687 100644 (file)
--- a/qcsrc/common/ent_cs.qc
+++ b/qcsrc/common/ent_cs.qc
@@ -12,6 +12,27 @@ REGISTRY_SORT(EntCSProps)
 REGISTRY_CHECK(EntCSProps)
 STATIC_INIT(RegisterEntCSProps_renumber) { FOREACH(EntCSProps, true, it.m_id = i); }
 
+// these entcs_props ids need to be referenced directly
+int ENTCS_PROP_ENTNUM_id = 0;
+int ENTCS_PROP_ORIGIN_id = 0;
+STATIC_INIT(RegisterEntCSProps_setglobalids)
+{
+       FOREACH(EntCSProps, true, {
+               if (it.registered_id == "ENTCS_PROP_ENTNUM")
+                       ENTCS_PROP_ENTNUM_id = it.m_id;
+               if (it.registered_id == "ENTCS_PROP_ORIGIN")
+                       ENTCS_PROP_ORIGIN_id = it.m_id;
+       });
+}
+
+#ifdef SVQC
+// Force an origin update, for player sounds
+void entcs_force_origin(entity player)
+{
+       CS(player).entcs.m_forceupdate = BIT(ENTCS_PROP_ORIGIN_id);
+}
+#endif
+
 .bool m_public;
 .bool(entity ent, entity player) m_check;
 .void(entity ent, entity player) m_set;
@@ -35,7 +56,7 @@ STATIC_INIT(RegisterEntCSProps_renumber) { FOREACH(EntCSProps, true, it.m_id = i
 
 #define ENTCS_PROP_CODED(id, ispublic, checkprop, setprop, decfactor, svsend, clreceive) \
        bool id##_check(entity ent, entity player) { \
-               return (floor(ent.(checkprop)) / decfactor != floor(player.(checkprop)) * decfactor); \
+               return (floor(ent.(checkprop)) / decfactor != floor(player.(checkprop)) / decfactor); \
        } \
        _ENTCS_PROP(id, ispublic, checkprop, setprop, svsend, clreceive)
 
@@ -139,7 +160,7 @@ ENTCS_PROP(FRAGS, true, frags, ENTCS_SET_NORMAL,
        bool _entcs_send(entity this, entity to, int sf, int chan)
        {
                entity player = this.owner;
-               sf |= BIT(0); // assume private
+               sf |= BIT(ENTCS_PROP_ENTNUM_id); // assume private
                do {
                        if (IS_PLAYER(player))
                        {
@@ -257,7 +278,7 @@ ENTCS_PROP(FRAGS, true, frags, ENTCS_SET_NORMAL,
                e.sv_entnum = n;
                int sf = ReadShort();
                e.has_sv_origin = false;
-               e.m_entcs_private = boolean(sf & BIT(0));
+               e.m_entcs_private = boolean(sf & BIT(ENTCS_PROP_ENTNUM_id));
                FOREACH(EntCSProps, sf & BIT(it.m_id),
                {
                        it.m_receive(e);