X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fgamemodes%2Fgamemode%2Fonslaught%2Fsv_controlpoint.qc;h=a00af18ff83119b0c991312fefdf3c8f981f0ec2;hb=2e05a1d8421ee2cbb604582d644133500aae2450;hp=491acdd007d8635cac7417c2bd5acdc11c6cff95;hpb=df2fe9b28cb6210b671bec6d5ae834ff4eb2e2db;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 491acdd00..a00af18ff 100644
--- a/qcsrc/common/gamemodes/gamemode/onslaught/sv_controlpoint.qc
+++ b/qcsrc/common/gamemodes/gamemode/onslaught/sv_controlpoint.qc
@@ -5,14 +5,14 @@
 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, this.origin_x);
-		WriteCoord(MSG_ENTITY, this.origin_y);
-		WriteCoord(MSG_ENTITY, this.origin_z);
+		WriteVector(MSG_ENTITY, this.origin);
 
-		WriteByte(MSG_ENTITY, this.health);
+		WriteByte(MSG_ENTITY, GetResourceAmount(this, RESOURCE_HEALTH));
 		WriteByte(MSG_ENTITY, this.max_health);
 		WriteByte(MSG_ENTITY, this.count);
 		WriteByte(MSG_ENTITY, this.team);
@@ -23,10 +23,10 @@ bool cpicon_send(entity this, entity to, int sf)
 	{
 		WriteByte(MSG_ENTITY, this.team);
 
-		if(this.health <= 0)
+		if(GetResourceAmount(this, RESOURCE_HEALTH) <= 0)
 			WriteByte(MSG_ENTITY, 0);
 		else
-			WriteByte(MSG_ENTITY, ceil((this.health / this.max_health) * 255));
+			WriteByte(MSG_ENTITY, ceil((GetResourceAmount(this, RESOURCE_HEALTH) / this.max_health) * 255));
 	}
 
 	return true;