X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Ffunc_breakable.qc;h=192e5cd7fb2e69f5b20b5708f4aec9af11224e28;hb=a9f034bd247570b2b06c435599db8e283c1a42de;hp=ca3d804d21ba8c2c1d8dfff8c885728d16a6b50b;hpb=ac8d34b7b43c9f282f0922dc7c52614318f8d06c;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/func_breakable.qc b/qcsrc/server/func_breakable.qc
index ca3d804d2..192e5cd7f 100644
--- a/qcsrc/server/func_breakable.qc
+++ b/qcsrc/server/func_breakable.qc
@@ -114,6 +114,7 @@ void func_breakable_behave_destroyed()
 {
 	self.health = self.max_health;
 	self.takedamage = DAMAGE_NO;
+	self.bot_attack = FALSE;
 	self.event_damage = SUB_Null;
 	self.state = 1;
 	func_breakable_colormod();
@@ -122,9 +123,16 @@ 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.bot_attack = TRUE;
 	self.event_damage = func_breakable_damage;
 	self.state = 0;
+	self.nextthink = 0; // cancel auto respawn
 	func_breakable_colormod();
 }
 
@@ -146,6 +154,7 @@ void func_breakable_destroy() {
 	string oldmsg;
 
 	activator = self.owner;
+	self.owner = world; // set by W_PrepareExplosionByDamage
 
 	// now throw around the debris
 	n = tokenize_console(self.debris);
@@ -155,7 +164,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);
@@ -163,6 +172,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();
@@ -179,9 +194,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)
@@ -251,3 +269,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();
+}