Clean up MENUQC #includes

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

diff --git a/qcsrc/warpzonelib/common.qc b/qcsrc/warpzonelib/common.qc
index f91301a5fe215cd4f3fca8fb9d74d4bf0a3a4928..3bec4be519b5ec7fe7fa4b751e94b1eabf8c03f2 100644 (file)
--- a/qcsrc/warpzonelib/common.qc
+++ b/qcsrc/warpzonelib/common.qc
@@ -1,5 +1,14 @@
-int trace_dphitcontents;
-.float dphitcontentsmask;
+#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)
 {
@@ -32,7 +41,7 @@ void WarpZone_Accumulator_AddInverse(entity acc, entity wz)
 }
 
 .vector(vector, vector) camera_transform;
-var float autocvar_cl_warpzone_usetrace = 1;
+float autocvar_cl_warpzone_usetrace = 1;
 vector WarpZone_camera_transform(vector org, vector ang)
 {
        vector vf, vr, vu;