]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
q3compat: make trigger_hurt without spawnflags 16 deal damage every frame even if...
authorbones_was_here <bones_was_here@yahoo.com.au>
Sun, 9 Aug 2020 15:48:29 +0000 (01:48 +1000)
committerbones_was_here <bones_was_here@yahoo.com.au>
Sun, 9 Aug 2020 15:48:29 +0000 (01:48 +1000)
qcsrc/common/mapobjects/trigger/hurt.qc

index 19447c41b99d2f3b563264f75601b85d50a2eae0..246bfdf9b55d9c1a35cf284339d063f48f6e0bd5 100644 (file)
@@ -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;