Listbox / Picker: Implement item fading in a different way so that it gets influenced...

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

diff --git a/qcsrc/warpzonelib/common.qc b/qcsrc/warpzonelib/common.qc
index 146fdfb834d98ac83e141b8d1c9ed44e1f6e42d9..aa0de911963a9bc700e6aa3167b2181633d7b7b6 100644 (file)
--- a/qcsrc/warpzonelib/common.qc
+++ b/qcsrc/warpzonelib/common.qc
@@ -1,3 +1,15 @@
+#if defined(CSQC)
+       #include "../dpdefs/csprogsdefs.qh"
+    #include "common.qh"
+    #include "../server/t_items.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qh"
+    #include "../dpdefs/dpextensions.qh"
+    #include "common.qh"
+    #include "../common/weapons/weapons.qh"
+#endif
+
 void WarpZone_Accumulator_Clear(entity acc)
 {
        acc.warpzone_transform = '0 0 0';
@@ -260,7 +272,7 @@ void WarpZone_TraceBox_ThroughZone(vector org, vector mi, vector ma, vector end,
        sol = -1;
        frac = 0;
        i = 16;
-       for(0;;)
+       for (;;)
        {
                if(--i < 1)
                {
@@ -383,7 +395,7 @@ void WarpZone_TraceToss_ThroughZone(entity e, entity forent, entity zone, WarpZo
        }
        WarpZone_MakeAllSolid();
        i = 16;
-       for(0;;)
+       for (;;)
        {
                if(--i < 1)
                {
@@ -506,7 +518,7 @@ vector WarpZone_TransformVAngles(entity wz, vector ang)
 #ifdef KEEP_ROLL
        float roll;
        roll = ang.z;
-       ang_z = 0;
+       ang.z = 0;
 #endif
 
        ang = AnglesTransform_ApplyToVAngles(wz.warpzone_transform, ang);
@@ -514,7 +526,7 @@ vector WarpZone_TransformVAngles(entity wz, vector ang)
 #ifdef KEEP_ROLL
        ang = AnglesTransform_Normalize(ang, true);
        ang = AnglesTransform_CancelRoll(ang);
-       ang_z = roll;
+       ang.z = roll;
 #else
        ang = AnglesTransform_Normalize(ang, false);
 #endif
@@ -542,22 +554,22 @@ vector WarpZone_UnTransformVAngles(entity wz, vector ang)
        float roll;
 
        roll = ang.z;
-       ang_z = 0;
+       ang.z = 0;
 
        ang = AnglesTransform_ApplyToVAngles(AnglesTransform_Invert(wz.warpzone_transform), ang);
        ang = AnglesTransform_Normalize(ang, true);
        ang = AnglesTransform_CancelRoll(ang);
 
-       ang_z = roll;
+       ang.z = roll;
        return ang;
 }
 
 vector WarpZoneLib_NearestPointOnBox(vector mi, vector ma, vector org)
 {
        vector nearest;
-       nearest_x = bound(mi.x, org.x, ma.x);
-       nearest_y = bound(mi.y, org.y, ma.y);
-       nearest_z = bound(mi.z, org.z, ma.z);
+       nearest.x = bound(mi.x, org.x, ma.x);
+       nearest.y = bound(mi.y, org.y, ma.y);
+       nearest.z = bound(mi.z, org.z, ma.z);
        return nearest;
 }