From: LegendaryGuard <rootuser999@gmail.com>
Date: Tue, 12 Oct 2021 07:31:57 +0000 (+0200)
Subject: Merge branch 'master' into LegendaryGuard/ttt
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=54664bc056f7f83298b38073cdd468e9ce4dd0bc;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into LegendaryGuard/ttt
---

54664bc056f7f83298b38073cdd468e9ce4dd0bc
diff --cc qcsrc/common/ent_cs.qc
index 211724485,a3691386b..4ef353a52
--- a/qcsrc/common/ent_cs.qc
+++ b/qcsrc/common/ent_cs.qc
@@@ -157,20 -157,25 +157,31 @@@ ENTCS_PROP(SOLID, true, sv_solid, solid
  	{ WriteByte(chan, ent.sv_solid); },
  	{ ent.sv_solid = ReadByte(); })
  
 +//LegendGuard adds ENTCS_PROP for MMM 20-02-2021
 +// gamemode specific player mmm status (independent of score and frags)
 +ENTCS_PROP(MMM_STATUS, true, mmm_status, mmm_status, ENTCS_SET_NORMAL,
 +	{ WriteShort(chan, ent.mmm_status); },
 +	{ ent.mmm_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;
  		});
  	}