s/world/NULL/

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

diff --git a/qcsrc/common/triggers/teleporters.qc b/qcsrc/common/triggers/teleporters.qc
index 90a426e630d8e3e0b46dfd271d454470e9216689..ba472ac55732e7f479c57fc6c97ccf028a06f20e 100644 (file)
--- a/qcsrc/common/triggers/teleporters.qc
+++ b/qcsrc/common/triggers/teleporters.qc
@@ -187,7 +187,7 @@ entity Simple_TeleportPlayer(entity teleporter, entity player)
        else
        {
                RandomSelection_Init();
-               for(e = world; (e = find(e, targetname, teleporter.target)); )
+               for(e = NULL; (e = find(e, targetname, teleporter.target)); )
                {
                        p = 1;
                        if(STAT(TELEPORT_TELEFRAG_AVOID, player))
@@ -250,7 +250,7 @@ void teleport_findtarget(entity this)
 {
        int n = 0;
        entity e;
-       for(e = world; (e = find(e, targetname, this.target)); )
+       for(e = NULL; (e = find(e, targetname, this.target)); )
        {
                ++n;
 #ifdef SVQC
@@ -275,7 +275,7 @@ void teleport_findtarget(entity this)
        else
        {
                // have to use random selection every single time
-               this.enemy = world;
+               this.enemy = NULL;
        }
 
        // now enable touch
@@ -288,10 +288,10 @@ void teleport_findtarget(entity this)
 entity Teleport_Find(vector mi, vector ma)
 {
        entity e;
-       for(e = world; (e = find(e, classname, "trigger_teleport")); )
-               if(WarpZoneLib_BoxTouchesBrush(mi, ma, e, world))
+       for(e = NULL; (e = find(e, classname, "trigger_teleport")); )
+               if(WarpZoneLib_BoxTouchesBrush(mi, ma, e, NULL))
                        return e;
-       return world;
+       return NULL;
 }
 
 void WarpZone_PostTeleportPlayer_Callback(entity pl)
@@ -313,7 +313,7 @@ void WarpZone_PostTeleportPlayer_Callback(entity pl)
                if(!(pl.move_flags & BIT(15))) // FL_PROJECTILE
        #endif
                        LOG_INFO("A non-projectile got through a warpzone and its owner cleared. It's a ", pl.classname, ".\n");
-               pl.owner = world;
+               pl.owner = NULL;
        }
        if(IS_PLAYER(pl))
        {