Merge branch 'master' into terencehill/hud_fixes

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

diff --git a/qcsrc/common/triggers/trigger/heal.qc b/qcsrc/common/triggers/trigger/heal.qc
index 49042427e61fa261f5d98f0fc05edf398fdc5cba..cbabe8dfd609096cea7a6bb7d6f79227c1cb112e 100644 (file)
--- a/qcsrc/common/triggers/trigger/heal.qc
+++ b/qcsrc/common/triggers/trigger/heal.qc
@@ -9,7 +9,7 @@ void trigger_heal_touch()
        if (other.iscreature)
        {
                if (other.takedamage)
-               if (!other.deadflag)
+               if (!IS_DEAD(other))
                if (other.triggerhealtime < time)
                {
                        EXACTTRIGGER_TOUCH;
@@ -25,8 +25,8 @@ void trigger_heal_touch()
        }
 }
 
-void spawnfunc_trigger_heal()
-{SELFPARAM();
+spawnfunc(trigger_heal)
+{
        self.active = ACTIVE_ACTIVE;
 
        EXACTTRIGGER_INIT;