X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fturrets%2Fcl_turrets.qc;h=51d3bc7fcee9958d5169e823299e4790966e421a;hp=fb27cd12137fef8e36cd30dfb09f133077c3cf6c;hb=e30214cf338291f1709fb02ed5e84cad9321e156;hpb=6c27fe90b0454df3dbf7b098bc554fcb5eaa75d0

diff --git a/qcsrc/common/turrets/cl_turrets.qc b/qcsrc/common/turrets/cl_turrets.qc
index fb27cd121..51d3bc7fc 100644
--- a/qcsrc/common/turrets/cl_turrets.qc
+++ b/qcsrc/common/turrets/cl_turrets.qc
@@ -176,7 +176,10 @@ void turret_draw2d(entity this)
 	}
 
 	o = drawspritearrow(o, M_PI, rgb, a, SPRITE_ARROW_SCALE * t);
-	o = drawsprite_TextOrIcon(true, o, M_PI, (SPRITE_HEALTHBAR_WIDTH + 2 * SPRITE_HEALTHBAR_BORDER) * t, rgb, a, waypointsprite_fontsize * '1 1 0', txt);
+	if(autocvar_g_waypointsprite_turrets_text)
+	{
+		o = drawsprite_TextOrIcon(true, o, M_PI, (SPRITE_HEALTHBAR_WIDTH + 2 * SPRITE_HEALTHBAR_BORDER) * t, rgb, a, waypointsprite_fontsize * '1 1 0', txt);
+	}
 	drawhealthbar(
 			o,
 			0,
@@ -221,7 +224,7 @@ void turret_construct(entity this, bool isnew)
 	set_movetype(this.tur_head, MOVETYPE_NOCLIP);
 	set_movetype(this, MOVETYPE_NOCLIP);
 	this.tur_head.angles			= this.angles;
-	SetResourceAmountExplicit(this, RESOURCE_HEALTH, 255);
+	SetResourceAmount(this, RESOURCE_HEALTH, 255);
 	this.solid						= SOLID_BBOX;
 	this.tur_head.solid				= SOLID_NOT;
 	set_movetype(this, MOVETYPE_NOCLIP);
@@ -425,10 +428,12 @@ NET_HANDLE(ENT_CLIENT_TURRET, bool isnew)
 		float myhp = GetResourceAmount(this, RESOURCE_HEALTH);
 		if(_tmp == 0 && myhp != 0)
 			turret_die(this);
-		else if(myhp && myhp != _tmp)
+		else if(myhp && myhp > _tmp)
 			this.helpme = servertime + 10;
+		else if(myhp && myhp < _tmp)
+			this.helpme = 0; // we're being healed, don't spam help me waypoints
 
-		SetResourceAmountExplicit(this, RESOURCE_HEALTH, _tmp);
+		SetResourceAmount(this, RESOURCE_HEALTH, _tmp);
 	}
 	return true;
 }