Merge branch 'master' into Mario/vehicles

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

diff --git a/qcsrc/warpzonelib/client.qc b/qcsrc/warpzonelib/client.qc
index 8704945f2a5605a72af3444b6c414f5d1b87d9bf..e0bb6434584efb034b554b9985febc3ff39a8280 100644 (file)
--- a/qcsrc/warpzonelib/client.qc
+++ b/qcsrc/warpzonelib/client.qc
@@ -1,3 +1,14 @@
+#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()
 {
        vector org;
@@ -141,9 +152,9 @@ void WarpZone_Teleported_Read(float isnew)
 {
        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)