Merge branch 'master' into Mario/entrap_nade

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

diff --git a/qcsrc/server/portals.qc b/qcsrc/server/portals.qc
index f0728b720084d011d909ce684835f2fb1c5aacd8..f6502dfd812335d794b6a43f79322a03f68a6402 100644 (file)
--- a/qcsrc/server/portals.qc
+++ b/qcsrc/server/portals.qc
@@ -369,8 +369,8 @@ void Portal_MakeOutPortal(entity portal)
 
 void Portal_Disconnect(entity teleporter, entity destination)
 {
-       teleporter.enemy = world;
-       destination.enemy = world;
+       teleporter.enemy = NULL;
+       destination.enemy = NULL;
        Portal_MakeBrokenPortal(teleporter);
        Portal_MakeBrokenPortal(destination);
 }
@@ -407,10 +407,10 @@ void Portal_Remove(entity portal, float killed)
        }
 
        if(portal == portal.aiment.portal_in)
-               portal.aiment.portal_in = world;
+               portal.aiment.portal_in = NULL;
        if(portal == portal.aiment.portal_out)
-               portal.aiment.portal_out = world;
-       //portal.aiment = world;
+               portal.aiment.portal_out = NULL;
+       //portal.aiment = NULL;
 
        // makes the portal vanish
        if(killed)
@@ -467,7 +467,7 @@ void Portal_Think(entity this)
 
        o = this.aiment;
        this.solid = SOLID_BBOX;
-       this.aiment = world;
+       this.aiment = NULL;
 
        g = frametime * '0 0 -1' * autocvar_sv_gravity;
 
@@ -494,8 +494,8 @@ void Portal_Think(entity this)
                Portal_Remove(this, 0);
 }
 
-float Portal_Customize()
-{SELFPARAM();
+float Portal_Customize(entity this)
+{
        if(IS_SPEC(other))
                other = other.enemy;
        if(other == this.aiment)
@@ -621,7 +621,7 @@ entity Portal_Spawn(entity own, vector org, vector ang)
 
        fixedmakevectors(ang);
        if(!CheckWireframeBox(own, org - 48 * v_right - 48 * v_up + 16 * v_forward, 96 * v_right, 96 * v_up, 96 * v_forward))
-               return world;
+               return NULL;
 
        portal = new(portal);
        portal.aiment = own;
@@ -638,12 +638,12 @@ entity Portal_Spawn(entity own, vector org, vector ang)
        portal.health = autocvar_g_balance_portal_health;
        setmodel(portal, MDL_PORTAL);
        portal.savemodelindex = portal.modelindex;
-       portal.customizeentityforclient = Portal_Customize;
+       setcefc(portal, Portal_Customize);
 
        if(!Portal_FindSafeOrigin(portal))
        {
                remove(portal);
-               return world;
+               return NULL;
        }
 
        setsize(portal, '-48 -48 -48', '48 48 48');