From: bones_was_here <bones_was_here@yahoo.com.au>
Date: Sun, 9 Aug 2020 15:48:29 +0000 (+1000)
Subject: q3compat: make trigger_hurt without spawnflags 16 deal damage every frame even if... 
X-Git-Tag: xonotic-v0.8.5~352^2~52
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=33205d85e6afeed580bd50883d087eb045adbc86;p=xonotic%2Fxonotic-data.pk3dir.git

q3compat: make trigger_hurt without spawnflags 16 deal damage every frame even if triggerhurttime still on cooldown
---

diff --git a/qcsrc/common/mapobjects/trigger/hurt.qc b/qcsrc/common/mapobjects/trigger/hurt.qc
index 19447c41b..246bfdf9b 100644
--- a/qcsrc/common/mapobjects/trigger/hurt.qc
+++ b/qcsrc/common/mapobjects/trigger/hurt.qc
@@ -22,10 +22,10 @@ void trigger_hurt_touch(entity this, entity toucher)
 	if (toucher.iscreature)
 	{
 		if (toucher.takedamage)
-		if (toucher.triggerhurttime < time)
+		if (toucher.triggerhurttime < time || (q3compat && !(this.spawnflags & HURT_SLOW)))
 		{
 			EXACTTRIGGER_TOUCH(this, toucher);
-			toucher.triggerhurttime = time + ((q3compat && !(this.spawnflags & HURT_SLOW)) ? 0.1 : 1);
+			toucher.triggerhurttime = time + 1;
 
 			entity own;
 			own = this.enemy;