From: Mario <mario.mario@y7mail.com>
Date: Fri, 10 Sep 2021 16:00:50 +0000 (+1000)
Subject: Merge branch 'master' into Mario/survival
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=86b5bb3685b9f53f1e5c1a9ea62b9215e407730a

Merge branch 'master' into Mario/survival
---

86b5bb3685b9f53f1e5c1a9ea62b9215e407730a
diff --cc qcsrc/common/ent_cs.qc
index e903bd5bb,a3691386b..7bc6aa525
--- a/qcsrc/common/ent_cs.qc
+++ b/qcsrc/common/ent_cs.qc
@@@ -157,19 -157,25 +157,30 @@@ ENTCS_PROP(SOLID, true, sv_solid, solid
  	{ WriteByte(chan, ent.sv_solid); },
  	{ ent.sv_solid = ReadByte(); })
  
 +// gamemode specific player survival status (independent of score and frags)
 +ENTCS_PROP(SURVIVAL_STATUS, true, survival_status, survival_status, ENTCS_SET_NORMAL,
 +	{ WriteShort(chan, ent.survival_status); },
 +	{ ent.survival_status = ReadShort(); })
 +
  #ifdef SVQC
  
- 	int ENTCS_PUBLICMASK = 0;
+ 	int ENTCS_PUBLICMASK = 0, ENTCS_PRIVATEMASK = 0;
  	STATIC_INIT(ENTCS_PUBLICMASK)
  	{
- 		FOREACH(EntCSProps, it.m_public,
+ 		FOREACH(EntCSProps, true,
  		{
- 			ENTCS_PUBLICMASK |= BIT(it.m_id);
+ 			if (it.m_public)
+ 				ENTCS_PUBLICMASK |= BIT(it.m_id);
+ 			else
+ 				ENTCS_PRIVATEMASK |= BIT(it.m_id);
+ 		});
+ 	}
+ 
+ 	void entcs_update_players(entity player)
+ 	{
+ 		FOREACH_CLIENT(it != player && IS_PLAYER(it),
+ 		{
+ 			CS(it).entcs.SendFlags |= ENTCS_PRIVATEMASK;
  		});
  	}