Merge branch 'master' into TimePath/spawnfunc

[xonotic/xonotic-data.pk3dir.git] / qcsrc / warpzonelib / client.qc

diff --git a/qcsrc/warpzonelib/client.qc b/qcsrc/warpzonelib/client.qc
index 5c2609a7dfbd388d8cb1b1172974b74fd8dbbd5a..85fbdd933e6e2453447d1b144f2663d92bc4a598 100644 (file)
--- a/qcsrc/warpzonelib/client.qc
+++ b/qcsrc/warpzonelib/client.qc
@@ -1,15 +1,16 @@
+#include "client.qh"
+#include "common.qh"
+
 #if defined(CSQC)
-       #include "../dpdefs/csprogsdefs.qh"
-       #include "common.qh"
-       #include "client.qh"
        #include "../client/autocvars.qh"
        #include "../csqcmodellib/cl_model.qh"
+       #include "../dpdefs/csprogsdefs.qh"
 #elif defined(MENUQC)
 #elif defined(SVQC)
 #endif
 
 void WarpZone_Fade_PreDraw()
-{
+{SELFPARAM();
        vector org;
        org = getpropertyvec(VF_ORIGIN);
        if(!checkpvs(org, self)) // this makes sense as long as we don't support recursive warpzones
@@ -26,7 +27,7 @@ void WarpZone_Fade_PreDraw()
 }
 
 void WarpZone_Read(float isnew)
-{
+{SELFPARAM();
        warpzone_warpzones_exist = 1;
        if (!self.enemy)
        {
@@ -91,7 +92,7 @@ void WarpZone_Read(float isnew)
 }
 
 void WarpZone_Camera_Read(float isnew)
-{
+{SELFPARAM();
        warpzone_cameras_exist = 1;
        self.classname = "func_warpzone_camera";
 
@@ -148,7 +149,7 @@ void WarpZone_Camera_Read(float isnew)
 
 void CL_RotateMoves(vector ang) = #638;
 void WarpZone_Teleported_Read(float isnew)
-{
+{SELFPARAM();
        vector v;
        self.classname = "warpzone_teleported";
        v.x = ReadCoord();