change extend/reducematchtime from an rpn alias into QC logic

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / func_breakable.qc

diff --git a/qcsrc/server/func_breakable.qc b/qcsrc/server/func_breakable.qc
index ca3d804d21ba8c2c1d8dfff8c885728d16a6b50b..3af433aceb075b966993512f0f42f330906bc487 100644 (file)
--- a/qcsrc/server/func_breakable.qc
+++ b/qcsrc/server/func_breakable.qc
@@ -122,6 +122,11 @@ 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;
@@ -146,6 +151,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);
@@ -179,9 +185,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)