Remove legacy Quake bbox expansion: map entities

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / mapobjects / func / ladder.qc

diff --git a/qcsrc/common/mapobjects/func/ladder.qc b/qcsrc/common/mapobjects/func/ladder.qc
index 36f802f4ad6db241ad5ec55ec64abca32e0ca751..d60c28abc81cf04cb54c0d390a4166a8b5c36da8 100644 (file)
--- a/qcsrc/common/mapobjects/func/ladder.qc
+++ b/qcsrc/common/mapobjects/func/ladder.qc
@@ -3,6 +3,7 @@ REGISTER_NET_LINKED(ENT_CLIENT_LADDER)
 
 void func_ladder_think(entity this)
 {
+
 #ifdef CSQC
        // TODO: check if this is what is causing the glitchiness when switching between them
        float dt = time - this.move_time;
@@ -19,21 +20,11 @@ void func_ladder_think(entity this)
 
        FOREACH_ENTITY_RADIUS((this.absmin + this.absmax) * 0.5, vlen(this.absmax - this.absmin) * 0.5 + 1, !it.ladder_entity && IS_PLAYER(it) && it.move_movetype != MOVETYPE_NOCLIP && !IS_DEAD(it),
        {
-               vector emin = it.absmin;
-               vector emax = it.absmax;
-               if(this.solid == SOLID_BSP || (IS_CSQC && this.solid == SOLID_TRIGGER)) // CSQC doesn't expand properly
-               {
-                       emin -= '1 1 1';
-                       emax += '1 1 1';
-               }
-               if(boxesoverlap(emin, emax, this.absmin, this.absmax)) // quick
+               if (WarpZoneLib_ExactTrigger_Touch(this, it, false))
                {
-                       if(WarpZoneLib_BoxTouchesBrush(emin, emax, this, it)) // accurate
-                       {
-                               if(!it.ladder_entity)
-                                       IL_PUSH(g_ladderents, it);
-                               it.ladder_entity = this;
-                       }
+                       if(!it.ladder_entity)
+                               IL_PUSH(g_ladderents, it);
+                       it.ladder_entity = this;
                }
        });
 
@@ -64,7 +55,8 @@ void func_ladder_link(entity this)
 
 void func_ladder_init(entity this)
 {
-       trigger_init(this);
+       EXACTTRIGGER_INIT;
+       BITSET_ASSIGN(this.effects, EF_NODEPTHTEST);
        func_ladder_link(this);
        setthink(this, func_ladder_think);
        this.nextthink = time;
@@ -177,10 +169,6 @@ NET_HANDLE(ENT_CLIENT_LADDER, bool isnew)
        this.move_time = time;
        this.entremove = func_ladder_remove;
 
-       // NOTE: CSQC's version of setorigin doesn't expand
-       this.absmin -= '1 1 1';
-       this.absmax += '1 1 1';
-
        return true;
 }
 #endif