Revert "Remove legacy Quake bbox expansion: map entities"

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / mapobjects / trigger / viewloc.qc

diff --git a/qcsrc/common/mapobjects/trigger/viewloc.qc b/qcsrc/common/mapobjects/trigger/viewloc.qc
index ddfd5a1f1ed657eb58dccf65875e85c1b1372cda..4679e75f7f0f521c4248676365578de1e10b6851 100644 (file)
--- a/qcsrc/common/mapobjects/trigger/viewloc.qc
+++ b/qcsrc/common/mapobjects/trigger/viewloc.qc
@@ -32,16 +32,37 @@ void viewloc_think(entity this)
 #if 1
        FOREACH_CLIENT(!it.viewloc && IS_PLAYER(it),
        {
-               if (WarpZoneLib_ExactTrigger_Touch(this, it, false))
-                       it.viewloc = this;
+               vector emin = it.absmin;
+               vector emax = it.absmax;
+               if(this.solid == SOLID_BSP)
+               {
+                       emin -= '1 1 1';
+                       emax += '1 1 1';
+               }
+               if(boxesoverlap(emin, emax, this.absmin, this.absmax)) // quick
+               {
+                       if(WarpZoneLib_BoxTouchesBrush(emin, emax, this, it)) // accurate
+                               it.viewloc = this;
+               }
        });
 #else
-       for(e = findradius((this.absmin + this.absmax) * 0.5, vlen(this.absmax - this.absmin) * 0.5 + 1); e; e = e.chain)
-               if(!e.viewloc)
-                       if(IS_PLAYER(e)) // should we support non-player entities with this?
-                       //if(!IS_DEAD(e)) // death view is handled separately, we can't override this just yet
-                               if (WarpZoneLib_ExactTrigger_Touch(this, it, false))
-                                       e.viewloc = this;
+
+               for(e = findradius((this.absmin + this.absmax) * 0.5, vlen(this.absmax - this.absmin) * 0.5 + 1); e; e = e.chain)
+                       if(!e.viewloc)
+                               if(IS_PLAYER(e)) // should we support non-player entities with this?
+                               //if(!IS_DEAD(e)) // death view is handled separately, we can't override this just yet
+                               {
+                                       vector emin = e.absmin;
+                                       vector emax = e.absmax;
+                                       if(this.solid == SOLID_BSP)
+                                       {
+                                               emin -= '1 1 1';
+                                               emax += '1 1 1';
+                                       }
+                                       if(boxesoverlap(emin, emax, this.absmin, this.absmax)) // quick
+                                               if(WarpZoneLib_BoxTouchesBrush(emin, emax, this, e)) // accurate
+                                                       e.viewloc = this;
+                               }
 #endif
 
        this.nextthink = time;