X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Ffunc_breakable.qc;h=1e474c0d641a34764fb55578f77614927f280f33;hb=9c40c25078426ed90e985c402c648fea3e3a8832;hp=44605ddeee793899a83ad425d6ed0182a4a856e2;hpb=bc51fd3d6308269b5ad770ef62b23fe98ee2cfe1;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/func_breakable.qc b/qcsrc/server/func_breakable.qc
index 44605ddee..1e474c0d6 100644
--- a/qcsrc/server/func_breakable.qc
+++ b/qcsrc/server/func_breakable.qc
@@ -122,9 +122,15 @@ void func_breakable_behave_destroyed()
 void func_breakable_behave_restore()
 {
 	self.health = self.max_health;
+	if(self.sprite)
+	{
+		WaypointSprite_UpdateMaxHealth(self.sprite, self.max_health);
+		WaypointSprite_UpdateHealth(self.sprite, self.health);
+	}
 	self.takedamage = DAMAGE_AIM;
 	self.event_damage = func_breakable_damage;
 	self.state = 0;
+	self.nextthink = 0; // cancel auto respawn
 	func_breakable_colormod();
 }
 
@@ -156,7 +162,7 @@ void func_breakable_destroy() {
 	func_breakable_destroyed();
 
 	if(self.noise)
-		sound (self, CHAN_AUTO, self.noise, VOL_BASE, ATTN_NORM);
+		sound (self, CH_TRIGGER, self.noise, VOL_BASE, ATTN_NORM);
 
 	if(self.dmg)
 		RadiusDamage(self, activator, self.dmg, self.dmg_edge, self.dmg_radius, self, self.dmg_force, DEATH_HURTTRIGGER, world);
@@ -164,6 +170,12 @@ void func_breakable_destroy() {
 	if(self.cnt)
 		pointparticles(self.cnt, self.absmin * 0.5 + self.absmax * 0.5, '0 0 0', self.count);
 
+	if(self.respawntime)
+	{
+		self.think = func_breakable_restore;
+		self.nextthink = time + self.respawntime + crandom() * self.respawntimejitter;
+	}
+
 	oldmsg = self.message;
 	self.message = "";
 	SUB_UseTargets();
@@ -180,9 +192,12 @@ void func_breakable_damage(entity inflictor, entity attacker, float damage, floa
 	if(self.team)
 		if(attacker.team == self.team)
 			return;
+	self.health = self.health - damage;
 	if(self.sprite)
+	{
 		WaypointSprite_Ping(self.sprite);
-	self.health = self.health - damage;
+		WaypointSprite_UpdateHealth(self.sprite, self.health);
+	}
 	func_breakable_colormod();
 
 	if(self.health <= 0)
@@ -252,3 +267,8 @@ void spawnfunc_func_breakable() {
 	self.reset = func_breakable_reset;
 	func_breakable_reset();
 }
+
+// for use in maps with a "model" key set
+void spawnfunc_misc_breakablemodel() {
+	spawnfunc_func_breakable();
+}