Merge branch 'master' into TimePath/global_self

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

diff --git a/qcsrc/server/portals.qc b/qcsrc/server/portals.qc
index 7bb6332b07d381f1725d9e9e808dfd2a53b94e6b..e02c04d6b25e5bcffc0139424d51a2c0fadfad0b 100644 (file)
--- a/qcsrc/server/portals.qc
+++ b/qcsrc/server/portals.qc
@@ -248,7 +248,7 @@ float Portal_WillHitPlane(vector eorg, vector emins, vector emaxs, vector evel,
 }
 
 void Portal_Touch()
-{
+{SELFPARAM();
        vector g;
 
 #ifdef PORTALS_ARE_NOT_SOLID
@@ -415,7 +415,7 @@ void Portal_Remove(entity portal, float killed)
        {
                fixedmakevectors(portal.mangle);
                sound(portal, CH_SHOTS, "porto/explode.wav", VOL_BASE, ATTEN_NORM);
-               Send_Effect("rocket_explode", portal.origin + v_forward * 16, v_forward * 1024, 4);
+               Send_Effect(EFFECT_ROCKET_EXPLODE, portal.origin + v_forward * 16, v_forward * 1024, 4);
                remove(portal);
        }
        else
@@ -427,7 +427,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)
                return;
        if(attacker != self.aiment)
@@ -439,7 +439,7 @@ void Portal_Damage(entity inflictor, entity attacker, float damage, int deathtyp
 }
 
 void Portal_Think_TryTeleportPlayer(entity e, vector g)
-{
+{SELFPARAM();
        if(!Portal_WillHitPlane(e.origin, e.mins, e.maxs, e.velocity + g, self.origin, v_forward, self.maxs.x))
                return;
 
@@ -451,7 +451,7 @@ void Portal_Think_TryTeleportPlayer(entity e, vector g)
 }
 
 void Portal_Think()
-{
+{SELFPARAM();
        entity e, o;
        vector g;
 
@@ -494,7 +494,7 @@ void Portal_Think()
 }
 
 float Portal_Customize()
-{
+{SELFPARAM();
        if(IS_SPEC(other))
                other = other.enemy;
        if(other == self.aiment)
@@ -574,7 +574,7 @@ void Portal_ClearAll(entity own)
        W_Porto_Remove(own);
 }
 void Portal_RemoveLater_Think()
-{
+{SELFPARAM();
        Portal_Remove(self, self.cnt);
 }
 void Portal_RemoveLater(entity portal, float kill)