X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fassault.qc;h=05b2cc750232e5fbc65a5136decf6d524c864fee;hb=c7bb7053f75c6c2778a0a7e026b1849162673ce1;hp=0d7da73572a3083af09aff6a296b55afbe4fabf2;hpb=5c13b3af01e247f840b7b3cf85d0e0d217eae4af;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/assault.qc b/qcsrc/server/assault.qc
index 0d7da7357..05b2cc750 100644
--- a/qcsrc/server/assault.qc
+++ b/qcsrc/server/assault.qc
@@ -71,7 +71,11 @@ void assault_objective_decrease_use() {
 	}
 
 	if(other.assault_sprite)
+	{
 		WaypointSprite_Disown(other.assault_sprite, waypointsprite_deadlifetime);
+		if(other.classname == "func_assault_destructible")
+			other.sprite = world;
+	}
 	else
 		return; // already activated! cannot activate again!
 
@@ -148,7 +152,11 @@ void target_objective_decrease_activate()
 	for(ent = world; (ent = find(ent, target, self.targetname)); )
 	{
 		if(ent.assault_sprite != world)
+		{
 			WaypointSprite_Disown(ent.assault_sprite, waypointsprite_deadlifetime);
+			if(ent.classname == "func_assault_destructible")
+				ent.sprite = world;
+		}
 
 		spr = WaypointSprite_SpawnFixed("<placeholder>", 0.5 * (ent.absmin + ent.absmax), ent, assault_sprite);
 		spr.assault_decreaser = self;
@@ -156,7 +164,12 @@ void target_objective_decrease_activate()
 		spr.classname = "sprite_waypoint";
 		WaypointSprite_UpdateRule(spr, assault_attacker_team, SPRITERULE_TEAMPLAY);
 		if(ent.classname == "func_assault_destructible")
+		{
 			WaypointSprite_UpdateSprites(spr, "as-defend", "as-destroy", "as-destroy");
+			WaypointSprite_UpdateMaxHealth(spr, ent.max_health);
+			WaypointSprite_UpdateHealth(spr, ent.health);
+			ent.sprite = spr;
+		}
 		else
 			WaypointSprite_UpdateSprites(spr, "as-defend", "as-push", "as-push");
 		WaypointSprite_UpdateTeamRadar(spr, RADARICON_OBJECTIVE, '1 0.5 0');