s/world/NULL/

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

diff --git a/qcsrc/server/g_subs.qc b/qcsrc/server/g_subs.qc
index 3fb232f02f58ed683fe27c22b84091a02e1bf4b5..1b12174b990bd4f73869ab59323169bcab30cc60 100644 (file)
--- a/qcsrc/server/g_subs.qc
+++ b/qcsrc/server/g_subs.qc
@@ -212,12 +212,12 @@ vector findbetterlocation (vector org, float mindist)
        c = 0;
        while (c < 6)
        {
-               traceline (org, org + vec, true, world);
+               traceline (org, org + vec, true, NULL);
                vec = vec * -1;
                if (trace_fraction < 1)
                {
                        loc = trace_endpos;
-                       traceline (loc, loc + vec, true, world);
+                       traceline (loc, loc + vec, true, NULL);
                        if (trace_fraction >= 1)
                                org = loc + vec;
                }
@@ -277,7 +277,7 @@ void LODmodel_attach(entity this)
 
        if(this.lodtarget1 != "")
        {
-               e = find(world, targetname, this.lodtarget1);
+               e = find(NULL, targetname, this.lodtarget1);
                if(e)
                {
                        this.lodmodel1 = e.model;
@@ -286,7 +286,7 @@ void LODmodel_attach(entity this)
        }
        if(this.lodtarget2 != "")
        {
-               e = find(world, targetname, this.lodtarget2);
+               e = find(NULL, targetname, this.lodtarget2);
                if(e)
                {
                        this.lodmodel2 = e.model;
@@ -321,7 +321,7 @@ void LODmodel_attach(entity this)
        }
 
        if(this.lodmodelindex1)
-               if (!this.SendEntity)
+               if (!getSendEntity(this))
                        SetCustomizer(this, LOD_customize, LOD_uncustomize);
 }
 
@@ -414,12 +414,12 @@ void InitTrigger(entity this)
 {
 // trigger angles are used for one-way touches.  An angle of 0 is assumed
 // to mean no restrictions, so use a yaw of 360 instead.
-       SetMovedir(self);
-       self.solid = SOLID_TRIGGER;
+       SetMovedir(this);
+       this.solid = SOLID_TRIGGER;
        SetBrushEntityModel(this);
-       self.movetype = MOVETYPE_NONE;
-       self.modelindex = 0;
-       self.model = "";
+       this.movetype = MOVETYPE_NONE;
+       this.modelindex = 0;
+       this.model = "";
 }
 
 void InitSolidBSPTrigger(entity this)
@@ -443,7 +443,7 @@ bool InitMovingBrushTrigger(entity this)
        this.movetype = MOVETYPE_PUSH;
        if(this.modelindex == 0)
        {
-               objerror("InitMovingBrushTrigger: no brushes found!");
+               objerror(this, "InitMovingBrushTrigger: no brushes found!");
                return false;
        }
        return true;