Merge branch 'bones_was_here/BoxTouchesBrush' into 'master'

WarpZoneLib_BoxTouchesBrush() fixes

See merge request xonotic/xonotic-data.pk3dir!1142

diff --git a/qcsrc/lib/warpzone/common.qc b/qcsrc/lib/warpzone/common.qc
index 0c85d4a088522cce87bbd09fa6b7a2f95ff4f60f..12fc316fd74078131e95734385a78afe2b21bf90 100644 (file)
--- a/qcsrc/lib/warpzone/common.qc
+++ b/qcsrc/lib/warpzone/common.qc
@@ -101,17 +101,12 @@ void WarpZone_Camera_SetUp(entity e, vector my_org, vector my_ang) // we assume
 
 .entity enemy;
 
-vector WarpZoneLib_BoxTouchesBrush_mins;
-vector WarpZoneLib_BoxTouchesBrush_maxs;
-entity WarpZoneLib_BoxTouchesBrush_ent;
-entity WarpZoneLib_BoxTouchesBrush_ignore;
-float WarpZoneLib_BoxTouchesBrush_Recurse()
+float WarpZoneLib_BoxTouchesBrush_Recurse(vector mi, vector ma, entity e, entity ig)
 {
-       float s;
+       float f, s;
        entity se;
-       float f;
 
-       tracebox('0 0 0', WarpZoneLib_BoxTouchesBrush_mins, WarpZoneLib_BoxTouchesBrush_maxs, '0 0 0', MOVE_NOMONSTERS, WarpZoneLib_BoxTouchesBrush_ignore);
+       tracebox('0 0 0', mi, ma, '0 0 0', MOVE_NOMONSTERS, ig);
 #ifdef CSQC
        if (trace_networkentity)
        {
@@ -123,35 +118,52 @@ float WarpZoneLib_BoxTouchesBrush_Recurse()
 #endif
        if (!trace_ent)
                return 0;
-       if (trace_ent == WarpZoneLib_BoxTouchesBrush_ent)
+       if (trace_ent == e)
                return 1;
 
        se = trace_ent;
        s = se.solid;
        se.solid = SOLID_NOT;
-       f = WarpZoneLib_BoxTouchesBrush_Recurse();
+       setorigin(se, se.origin); // unlink
+       f = WarpZoneLib_BoxTouchesBrush_Recurse(mi, ma, e, ig);
        se.solid = s;
+       setorigin(se, se.origin); // relink
 
        return f;
 }
 
 float WarpZoneLib_BoxTouchesBrush(vector mi, vector ma, entity e, entity ig)
 {
-    float f, s;
+       // bones_was_here: TODO: when findbox() builtin is available, use it to
+       // optimise this into a single non-recursive function that only calls tracebox once
 
-    if(!e.modelindex || e.warpzone_isboxy)
-        return 1;
+       float f, s;
 
-    s = e.solid;
-    e.solid = SOLID_BSP;
-    WarpZoneLib_BoxTouchesBrush_mins = mi;
-    WarpZoneLib_BoxTouchesBrush_maxs = ma;
-    WarpZoneLib_BoxTouchesBrush_ent = e;
-    WarpZoneLib_BoxTouchesBrush_ignore = ig;
-    f = WarpZoneLib_BoxTouchesBrush_Recurse();
-    e.solid = s;
+       if(!e.modelindex || e.warpzone_isboxy)
+               return 1;
+
+       // work around trigger_hurt on geit3ctf1 not being detected by tracebox
+       // bones_was_here: FIXME: WHY do these triggers only have supercontents == 128 ?!
+       if (Q3COMPAT_COMMON && ig != world)
+               ig.dphitcontentsmask |= 128;
 
-    return f;
+       s = e.solid;
+       if (e.solid != SOLID_BSP)
+       {
+               e.solid = SOLID_BSP;
+               setorigin(e, e.origin); // update linking
+       }
+       f = WarpZoneLib_BoxTouchesBrush_Recurse(mi, ma, e, ig);
+       if (e.solid != s) // if we needed to change .solid temporarily
+       {
+               e.solid = s; // restore it
+               setorigin(e, e.origin); // update linking
+       }
+
+       if (Q3COMPAT_COMMON && ig != world)
+               ig.dphitcontentsmask &= ~128;
+
+       return f;
 }
 
 entity WarpZone_Find(vector mi, vector ma)