]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1703040)
func_door: fix .dmg field having no effect
authorbones_was_here <bones_was_here@xonotic.au>
Wed, 12 Oct 2022 12:44:29 +0000 (22:44 +1000)
committerbones_was_here <bones_was_here@xonotic.au>
Thu, 16 Feb 2023 11:07:25 +0000 (21:07 +1000)
The player's .takedamage == DAMAGE_AIM not DAMAGE_YES

qcsrc/common/mapobjects/func/door.qc patch | blob | history

diff --git a/qcsrc/common/mapobjects/func/door.qc b/qcsrc/common/mapobjects/func/door.qc
index 1e8dcec70070ea620e541b5d7fcdc4dbf2c71ae6..1a0e12162a143f7e24e65e9fc604f6b31126f474 100644 (file)
--- a/qcsrc/common/mapobjects/func/door.qc
+++ b/qcsrc/common/mapobjects/func/door.qc
@@ -43,7 +43,7 @@ void door_blocked(entity this, entity blocker)
        else
        {
 #ifdef SVQC
-               if((this.dmg) && (blocker.takedamage == DAMAGE_YES))    // Shall we bite?
+               if(this.dmg && blocker.takedamage != DAMAGE_NO)    // Shall we bite?
                        Damage (blocker, this, this, this.dmg, DEATH_HURTTRIGGER.m_id, DMG_NOWEP, blocker.origin, '0 0 0');
 #endif