Make a generic trigger touch function

[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 961ecdc0e84847a52b577286317d2287e8179830..1f45f9c8241ec6f7b9f8a52dbd0bc2e291e8bbf2 100644 (file)
--- a/qcsrc/server/t_halflife.qc
+++ b/qcsrc/server/t_halflife.qc
@@ -119,25 +119,7 @@ void func_ladder_draw()
        self.move_time = time;
        if(dt <= 0) { return; }
 
-       entity e;
-
-               for(e = findradius((self.absmin + self.absmax) * 0.5, vlen(self.absmax - self.absmin) * 0.5 + 1); e; e = e.chain)
-                               if(e.isplayermodel)
-                               {
-                                       vector emin = e.absmin;
-                                       vector emax = e.absmax;
-                                       if(self.solid == SOLID_BSP)
-                                       {
-                                               emin -= '1 1 1';
-                                               emax += '1 1 1';
-                                       }
-                                       if(boxesoverlap(emin, emax, self.absmin, self.absmax)) // quick
-                                               if(WarpZoneLib_BoxTouchesBrush(emin, emax, self, e)) // accurate
-                                               {
-                                                       other = e;
-                                                       func_ladder_touch();
-                                               }
-                               }
+       trigger_touch_generic(func_ladder_touch);
 }
 
 void ent_func_ladder()