Merge branch 'master' into Mario/vehicles

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / t_halflife.qc

diff --git a/qcsrc/server/t_halflife.qc b/qcsrc/server/t_halflife.qc
index a55fbacda1436923baef5c57f21451494489732f..0d77747242b9fdbd1513dea864e4d048efd680a4 100644 (file)
--- a/qcsrc/server/t_halflife.qc
+++ b/qcsrc/server/t_halflife.qc
@@ -1,11 +1,10 @@
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-       #include "../dpdefs/progsdefs.qh"
-    #include "../warpzonelib/util_server.qh"
-    #include "defs.qh"
-    #include "../common/vehicles/sv_vehicles.qh"
-#endif
+#include "_all.qh"
+
+#include "../warpzonelib/util_server.qh"
+#include "../common/vehicles/sv_vehicles.qh"
+
+.float  ladder_time;
+.entity ladder_entity;
 
 .float  roomtype;
 .float  radius;