X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fent_cs.qc;h=59f5fae4efa11454965adcf6da034029c53f4507;hb=ea7a3b717331f01a459bf8e19a6ae259987a8fe2;hp=a3691386be379296ae2b494025666e320a13de18;hpb=f65172de07f5fb4ed14eca045b5aa6807e3cc27f;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/ent_cs.qc b/qcsrc/common/ent_cs.qc
index a3691386b..59f5fae4e 100644
--- a/qcsrc/common/ent_cs.qc
+++ b/qcsrc/common/ent_cs.qc
@@ -151,12 +151,21 @@ ENTCS_PROP(CLIENTCOLORS, true, clientcolors, clientcolors, ENTCS_SET_NORMAL,
 ENTCS_PROP(FRAGS, true, frags, frags, ENTCS_SET_NORMAL,
 	{ WriteShort(chan, ent.frags); },
 	{ ent.frags = ReadShort(); })
+	
+ENTCS_PROP(COUNTRYCODE, true, countrycode, countrycode, ENTCS_SET_NORMAL,
+	{ WriteByte(chan, ent.countrycode); },
+	{ ent.countrycode = ReadByte(); })
 
 // use sv_solid to avoid changing solidity state of entcs entities
 ENTCS_PROP(SOLID, true, sv_solid, solid, ENTCS_SET_NORMAL,
 	{ WriteByte(chan, ent.sv_solid); },
 	{ ent.sv_solid = ReadByte(); })
 
+// z411 weapon
+ENTCS_PROP(ACTIVEWEPID, false, activewepid, activewepid, ENTCS_SET_NORMAL,
+	{ WriteByte(chan, ent.activewepid); },
+	{ ent.activewepid = ReadByte(); })
+
 #ifdef SVQC
 
 	int ENTCS_PUBLICMASK = 0, ENTCS_PRIVATEMASK = 0;
@@ -188,7 +197,7 @@ ENTCS_PROP(SOLID, true, sv_solid, solid, ENTCS_SET_NORMAL,
 			{
 				if (radar_showenemies) break;
 				if (SAME_TEAM(to, player)) break;
-				if (!(IS_PLAYER(to) || to.caplayer)) break;
+				if (!(IS_PLAYER(to) || INGAME(to))) break;
 			}
 			sf &= ENTCS_PUBLICMASK; // no private updates
 		} while (0);