Give Damage a weaponentity parameter (fixes some dual wielding related issues)

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

diff --git a/qcsrc/common/triggers/trigger/hurt.qc b/qcsrc/common/triggers/trigger/hurt.qc
index d0ba4ebd19b252e925e425bb6cd2089475cffeff..9c09f923bec779ba7495071a113cddcca0011aa3 100644 (file)
--- a/qcsrc/common/triggers/trigger/hurt.qc
+++ b/qcsrc/common/triggers/trigger/hurt.qc
@@ -35,7 +35,7 @@ void trigger_hurt_touch(entity this, entity toucher)
                                this.enemy = NULL; // I still hate you all
                        }
 
-                       Damage (toucher, this, own, this.dmg, DEATH_HURTTRIGGER.m_id, toucher.origin, '0 0 0');
+                       Damage (toucher, this, own, this.dmg, DEATH_HURTTRIGGER.m_id, DMG_NOWEP, toucher.origin, '0 0 0');
                }
        }
        else if(toucher.damagedbytriggers)
@@ -43,7 +43,7 @@ void trigger_hurt_touch(entity this, entity toucher)
                if(toucher.takedamage)
                {
                        EXACTTRIGGER_TOUCH(this, toucher);
-                       Damage(toucher, this, this, this.dmg, DEATH_HURTTRIGGER.m_id, toucher.origin, '0 0 0');
+                       Damage(toucher, this, this, this.dmg, DEATH_HURTTRIGGER.m_id, DMG_NOWEP, toucher.origin, '0 0 0');
                }
        }