Merge branch 'master' into martin-t/globals

[xonotic/xonotic-data.pk3dir.git] / qcsrc / lib / warpzone / util_server.qc

diff --git a/qcsrc/lib/warpzone/util_server.qc b/qcsrc/lib/warpzone/util_server.qc
index 92c347a153dbd782b2a4828356f3015405ea8196..f09fecc3370d79cb2e69d8fbfc630b7530ae559f 100644 (file)
--- a/qcsrc/lib/warpzone/util_server.qc
+++ b/qcsrc/lib/warpzone/util_server.qc
@@ -9,41 +9,41 @@
 #endif
 #include "common.qh"
 
-void WarpZoneLib_ExactTrigger_Init()
-{SELFPARAM();
+void WarpZoneLib_ExactTrigger_Init(entity this)
+{
        vector mi, ma;
-       if (self.movedir == '0 0 0')
-       if (self.angles != '0 0 0')
+       if (this.movedir == '0 0 0')
+       if (this.angles != '0 0 0')
        {
-               makevectors (self.angles);
-               self.movedir = v_forward;
+               MAKE_VECTORS_NEW(this.angles, forward, _r, _u);
+               this.movedir = forward;
        }
-       if(self.model == "")
+       if(this.model == "")
        {
                // It's a box! No need to match with exacttriggers.
-               self.warpzone_isboxy = 1;
+               this.warpzone_isboxy = 1;
        }
        else
        {
-               mi = self.mins;
-               ma = self.maxs;
-               precache_model(self.model);
-               _setmodel(self, self.model);
+               mi = this.mins;
+               ma = this.maxs;
+               precache_model(this.model);
+               _setmodel(this, this.model);
                // let mapper-set mins/maxs override the model's bounds if set
                if(mi != '0 0 0' || ma != '0 0 0')
                {
                        // It's a box! No need to match with exacttriggers.
-                       self.mins = mi;
-                       self.maxs = ma;
-                       self.warpzone_isboxy = 1;
+                       this.mins = mi;
+                       this.maxs = ma;
+                       this.warpzone_isboxy = 1;
                }
        }
-       setorigin(self, self.origin);
-       if(self.scale)
-               setsize(self, self.mins * self.scale, self.maxs * self.scale);
+       setorigin(this, this.origin);
+       if(this.scale)
+               setsize(this, this.mins * this.scale, this.maxs * this.scale);
        else
-               setsize(self, self.mins, self.maxs);
-       self.movetype = MOVETYPE_NONE;
-       self.solid = SOLID_TRIGGER;
-       self.model = "";
+               setsize(this, this.mins, this.maxs);
+       set_movetype(this, MOVETYPE_NONE);
+       this.solid = SOLID_TRIGGER;
+       this.model = "";
 }