Merge remote-tracking branch 'origin/TimePath/experiments/csqc_prediction' into TimeP...

[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 412c8e96ad36b7defde098054655df0d322cdefd..4f6c1ca0e63585c07586d5356551989f1e8af445 100644 (file)
--- a/qcsrc/server/t_halflife.qc
+++ b/qcsrc/server/t_halflife.qc
@@ -1,3 +1,17 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qh"
+    #include "defs.qh"
+    #include "vehicles/vehicles_def.qh"
+#endif
+#include "../warpzonelib/util_server.qh"
+
+#include "miscfunctions.qh"
+#ifdef CSQC
+#define EXACTTRIGGER_TOUCH if(WarpZoneLib_ExactTrigger_Touch()) return
+#endif
+
 .float ladder_time;
 .entity ladder_entity;
 
@@ -86,12 +100,12 @@ float func_ladder_send(entity to, float sf)
        WriteCoord(MSG_ENTITY, self.angles_y);
        WriteCoord(MSG_ENTITY, self.angles_z);
 
-       return TRUE;
+       return true;
 }
 
 void func_ladder_link()
 {
-       Net_LinkEntity(self, FALSE, 0, func_ladder_send);
+       Net_LinkEntity(self, false, 0, func_ladder_send);
 }
 
 void spawnfunc_func_ladder()
@@ -117,18 +131,9 @@ void func_ladder_draw()
 {
        float dt = time - self.move_time;
        self.move_time = time;
-       if(dt <= 0)
-               return;
-
-       tracebox(self.origin, self.mins, self.maxs, self.origin, MOVE_NORMAL, self);
+       if(dt <= 0) { return; }
 
-       //if(trace_fraction < 1)
-       if(trace_ent)
-       if(time >= trace_ent.ladder_time)
-       {
-               other = trace_ent;
-               func_ladder_touch();
-       }
+       trigger_touch_generic(func_ladder_touch);
 }
 
 void ent_func_ladder()