From: Mario <mario@smbclan.net>
Date: Thu, 1 Feb 2018 17:38:01 +0000 (+1000)
Subject: Allow setting no delay on trigger_heal
X-Git-Tag: xonotic-v0.8.5~2357
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f1fb8c1024a83ba80f2372e15ac69908b32ea4c4;p=xonotic%2Fxonotic-data.pk3dir.git

Allow setting no delay on trigger_heal
---

diff --git a/qcsrc/common/triggers/trigger/heal.qc b/qcsrc/common/triggers/trigger/heal.qc
index 61a65d8b5..f2345e8f5 100644
--- a/qcsrc/common/triggers/trigger/heal.qc
+++ b/qcsrc/common/triggers/trigger/heal.qc
@@ -16,7 +16,8 @@ void trigger_heal_touch(entity this, entity toucher)
 			bool is_trigger = !boolean(!this.nottargeted && this.targetname != "");
 			if(is_trigger)
 				EXACTTRIGGER_TOUCH(this, toucher);
-			toucher.triggerhealtime = time + this.delay;
+			if(this.delay > 0)
+				toucher.triggerhealtime = time + this.delay;
 
 			bool playthesound = (this.spawnflags & 4);
 			if (toucher.health < this.max_health)