Merge branch 'master' into terencehill/scoreboard_item_stats

[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 4ef6b2f793b819805c3a78c5f0fb0e32f190ab2d..777bd417a6d2607a0e252dc3bbc3933b4b9b0462 100644 (file)
--- a/qcsrc/common/ent_cs.qc
+++ b/qcsrc/common/ent_cs.qc
@@ -1,8 +1,13 @@
 #include "ent_cs.qh"
-#include <common/gamemodes/_mod.qh>
-#include <common/resources.qh>
-#ifdef SVQC
-#include <server/resources.qh>
+
+#if defined(CSQC)
+       #include <common/gamemodes/_mod.qh>
+       #include <common/resources.qh>
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include <common/gamemodes/_mod.qh>
+       #include <common/resources.qh>
+       #include <server/resources.qh>
 #endif
 
 REGISTRY(EntCSProps, BITS(16) - 1)
@@ -16,13 +21,13 @@ STATIC_INIT(EntCSProps_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;
+int ENTCS_PROP_HEALTH_id = 0;
 STATIC_INIT(EntCSProps_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;
+               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;
+               if (it.registered_id == "ENTCS_PROP_HEALTH") ENTCS_PROP_HEALTH_id = it.m_id;
        });
 }
 
@@ -206,6 +211,11 @@ ENTCS_PROP(SOLID, true, sv_solid, solid, ENTCS_SET_NORMAL,
                        it.m_set(this, player);
                        this.SendFlags |= BIT(it.m_id);
                });
+               if (intermission_running)
+               {
+                       // health is set to special values after the game ends, ignore any change
+                       this.SendFlags &= ~BIT(ENTCS_PROP_HEALTH_id);
+               }
                setorigin(this, this.origin); // relink
        }
 
@@ -216,11 +226,14 @@ ENTCS_PROP(SOLID, true, sv_solid, solid, ENTCS_SET_NORMAL,
                setthink(e, entcs_think);
                e.nextthink = time;
                Net_LinkEntity(e, false, 0, entcs_send);
+               // NOTE: the following code block has been disabled as a workaround for https://gitlab.com/xonotic/xonotic-data.pk3dir/-/issues/1824
+#if 0
                if (!IS_REAL_CLIENT(player)) return;
                FOREACH_CLIENT(true, {
                        assert(CS(it).entcs);
                        _entcs_send(CS(it).entcs, msg_entity = player, BITS(23), MSG_ONE);
                });
+#endif
        }
 
        void entcs_detach(entity player)
@@ -269,7 +282,7 @@ ENTCS_PROP(SOLID, true, sv_solid, solid, ENTCS_SET_NORMAL,
                {
                        if (!this)
                                // initial = temp
-                               e = new_pure(entcs_receiver);
+                               e = new_pure(ENT_CLIENT_ENTCS);
                        else
                                // initial = linked
                                e = this;
@@ -305,7 +318,6 @@ ENTCS_PROP(SOLID, true, sv_solid, solid, ENTCS_SET_NORMAL,
                if (isnew)
                {
                        make_pure(this);
-                       this.classname = "entcs_receiver";
                        this.entremove = Ent_RemoveEntCS;
                }
                return ReadEntcs(this);