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=0941833de8acd7430cc7fb35cef56c104bf405bf;hpb=f60c05d53612aba786e7f24fc7a8920cd1b7495c;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 0941833de..a00af18ff 100644
--- a/qcsrc/common/gamemodes/gamemode/onslaught/sv_controlpoint.qc
+++ b/qcsrc/common/gamemodes/gamemode/onslaught/sv_controlpoint.qc
@@ -10,11 +10,9 @@ bool cpicon_send(entity this, entity to, int sf)
 	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);
@@ -25,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;