Merge branch 'master' into TimePath/deathtypes

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / portals.qc

diff --git a/qcsrc/server/portals.qc b/qcsrc/server/portals.qc
index ec5d688f60ff8219832b6701a4207ee73d419160..ca6442f979dff6515ea38f24018fb89afbdc917f 100644 (file)
--- a/qcsrc/server/portals.qc
+++ b/qcsrc/server/portals.qc
@@ -3,7 +3,7 @@
 #include "g_hook.qh"
 #include "mutators/mutators_include.qh"
 #include "../common/constants.qh"
-#include "../common/deathtypes.qh"
+#include "../common/deathtypes/all.qh"
 #include "../common/notifications.qh"
 #include "../common/triggers/teleporters.qh"
 #include "../common/triggers/subs.qh"
@@ -430,7 +430,7 @@ void Portal_Remove(entity portal, float killed)
 
 void Portal_Damage(entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force)
 {SELFPARAM();
-       if(deathtype == DEATH_TELEFRAG)
+       if(deathtype == DEATH_TELEFRAG.m_id)
                return;
        if(attacker != self.aiment)
                if(IS_INDEPENDENT_PLAYER(attacker) || IS_INDEPENDENT_PLAYER(self.aiment))