Properly hide minigame panels from the hud editor

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

diff --git a/qcsrc/warpzonelib/client.qc b/qcsrc/warpzonelib/client.qc
index af47d6b010c51823752d71a52eabfbb9f9189ae8..85fbdd933e6e2453447d1b144f2663d92bc4a598 100644 (file)
--- a/qcsrc/warpzonelib/client.qc
+++ b/qcsrc/warpzonelib/client.qc
@@ -1,5 +1,16 @@
+#include "client.qh"
+#include "common.qh"
+
+#if defined(CSQC)
+       #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
@@ -16,7 +27,7 @@ void WarpZone_Fade_PreDraw()
 }
 
 void WarpZone_Read(float isnew)
-{
+{SELFPARAM();
        warpzone_warpzones_exist = 1;
        if (!self.enemy)
        {
@@ -81,7 +92,7 @@ void WarpZone_Read(float isnew)
 }
 
 void WarpZone_Camera_Read(float isnew)
-{
+{SELFPARAM();
        warpzone_cameras_exist = 1;
        self.classname = "func_warpzone_camera";
 
@@ -138,12 +149,12 @@ 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();
-       v_y = ReadCoord();
-       v_z = ReadCoord();
+       v.x = ReadCoord();
+       v.y = ReadCoord();
+       v.z = ReadCoord();
        if(!isnew)
                return;
        self.warpzone_transform = v;
@@ -155,7 +166,6 @@ void WarpZone_Teleported_Read(float isnew)
 
 float warpzone_fixingview;
 float warpzone_fixingview_drawexteriormodel;
-float autocvar_chase_active;
 
 void WarpZone_View_Outside()
 {
@@ -185,12 +195,12 @@ vector WarpZone_FixNearClip(vector o, vector c0, vector c1, vector c2, vector c3
        entity e;
        float pd;
 
-       mi_x = min(o.x, c0_x, c1_x, c2_x, c3_x);
-       ma_x = max(o.x, c0_x, c1_x, c2_x, c3_x);
-       mi_y = min(o.y, c0_y, c1_y, c2_y, c3_y);
-       ma_y = max(o.y, c0_y, c1_y, c2_y, c3_y);
-       mi_z = min(o.z, c0_z, c1_z, c2_z, c3_z);
-       ma_z = max(o.z, c0_z, c1_z, c2_z, c3_z);
+       mi.x = min(o.x, c0_x, c1_x, c2_x, c3_x);
+       ma.x = max(o.x, c0_x, c1_x, c2_x, c3_x);
+       mi.y = min(o.y, c0_y, c1_y, c2_y, c3_y);
+       ma.y = max(o.y, c0_y, c1_y, c2_y, c3_y);
+       mi.z = min(o.z, c0_z, c1_z, c2_z, c3_z);
+       ma.z = max(o.z, c0_z, c1_z, c2_z, c3_z);
 
        e = WarpZone_Find(mi, ma);
        if(e)
@@ -223,7 +233,7 @@ void WarpZone_FixPMove()
 }
 
 #ifndef KEEP_ROLL
-var float autocvar_cl_rollkillspeed = 10;
+float autocvar_cl_rollkillspeed = 10;
 #endif
 void WarpZone_FixView()
 {