X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fgamemodes%2Fgamemode%2Fonslaught%2Fsv_controlpoint.qc;h=a00af18ff83119b0c991312fefdf3c8f981f0ec2;hb=50d6cb6a02a959a7303b5b687631b664a807b26f;hp=aceb3e64eacf9f504a2002d1b47dbde0dbb147cc;hpb=3d4a324cc2e15c1eb99209674942506eb998e2ec;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/gamemodes/gamemode/onslaught/sv_controlpoint.qc b/qcsrc/common/gamemodes/gamemode/onslaught/sv_controlpoint.qc
index aceb3e64e..a00af18ff 100644
--- a/qcsrc/common/gamemodes/gamemode/onslaught/sv_controlpoint.qc
+++ b/qcsrc/common/gamemodes/gamemode/onslaught/sv_controlpoint.qc
@@ -5,28 +5,28 @@
 bool cpicon_send(entity this, entity to, int sf)
 {
 	WriteHeader(MSG_ENTITY, ENT_CLIENT_CONTROLPOINT_ICON);
+	if(sf & CPSF_SETUP)
+		sf &= ~CPSF_STATUS;
 	WriteByte(MSG_ENTITY, sf);
 	if(sf & CPSF_SETUP)
 	{
-		WriteCoord(MSG_ENTITY, self.origin_x);
-		WriteCoord(MSG_ENTITY, self.origin_y);
-		WriteCoord(MSG_ENTITY, self.origin_z);
+		WriteVector(MSG_ENTITY, this.origin);
 
-		WriteByte(MSG_ENTITY, self.health);
-		WriteByte(MSG_ENTITY, self.max_health);
-		WriteByte(MSG_ENTITY, self.count);
-		WriteByte(MSG_ENTITY, self.team);
-		WriteByte(MSG_ENTITY, self.owner.iscaptured);
+		WriteByte(MSG_ENTITY, GetResourceAmount(this, RESOURCE_HEALTH));
+		WriteByte(MSG_ENTITY, this.max_health);
+		WriteByte(MSG_ENTITY, this.count);
+		WriteByte(MSG_ENTITY, this.team);
+		WriteByte(MSG_ENTITY, this.owner.iscaptured);
 	}
 
 	if(sf & CPSF_STATUS)
 	{
-		WriteByte(MSG_ENTITY, self.team);
+		WriteByte(MSG_ENTITY, this.team);
 
-		if(self.health <= 0)
+		if(GetResourceAmount(this, RESOURCE_HEALTH) <= 0)
 			WriteByte(MSG_ENTITY, 0);
 		else
-			WriteByte(MSG_ENTITY, ceil((self.health / self.max_health) * 255));
+			WriteByte(MSG_ENTITY, ceil((GetResourceAmount(this, RESOURCE_HEALTH) / this.max_health) * 255));
 	}
 
 	return true;