Merge branch 't0uYK8Ne/set_slick_friction' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / mapobjects / trigger / heal.qc

diff --git a/qcsrc/common/mapobjects/trigger/heal.qc b/qcsrc/common/mapobjects/trigger/heal.qc
index 61f27a0219184340edfeca6bd40a3f7d6ac46156..b110d9913fd97baa5b1d628b69c78fd173d32578 100644 (file)
--- a/qcsrc/common/mapobjects/trigger/heal.qc
+++ b/qcsrc/common/mapobjects/trigger/heal.qc
@@ -18,14 +18,9 @@ void trigger_heal_touch(entity this, entity toucher)
                                toucher.triggerhealtime = time + this.delay;
 
                        bool playthesound = (this.spawnflags & HEAL_SOUND_ALWAYS);
-                       if (GetResourceAmount(toucher, RESOURCE_HEALTH) < this.max_health)
-                       {
-                               playthesound = true;
-                               GiveResourceWithLimit(toucher, RESOURCE_HEALTH, GetResourceAmount(this, RESOURCE_HEALTH), this.max_health);
-                               toucher.pauserothealth_finished = max(toucher.pauserothealth_finished, time + autocvar_g_balance_pause_health_rot);
-                       }
+                       bool healed = Heal(toucher, this, this.health, this.max_health);
 
-                       if(playthesound)
+                       if(playthesound || healed)
                                _sound (toucher, CH_TRIGGER, this.noise, VOL_BASE, ATTEN_NORM);
                }
        }
@@ -41,8 +36,8 @@ void trigger_heal_init(entity this)
        this.active = ACTIVE_ACTIVE;
        if(!this.delay)
                this.delay = 1;
-       if(!GetResourceAmount(this, RESOURCE_HEALTH))
-               SetResourceAmountExplicit(this, RESOURCE_HEALTH, 10);
+       if(!this.health)
+               this.health = 10;
        if(!this.max_health)
                this.max_health = 200; // max health topoff for field
        if(this.noise == "")