]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Use an ordered list to find triggers to touch, fixes some odd cases with overlapping...
authorMario <mario.mario@y7mail.com>
Sun, 9 Aug 2020 12:01:43 +0000 (22:01 +1000)
committerMario <mario.mario@y7mail.com>
Sun, 9 Aug 2020 12:01:43 +0000 (22:01 +1000)
qcsrc/common/physics/movetypes/movetypes.qc

index eb57922b9d81020b76001a51474194432202035a..e207551838e03cd6bbe0f363f1677d17a1a6738f 100644 (file)
@@ -424,7 +424,7 @@ void _Movetype_LinkEdict_TouchAreaGrid(entity this)  // SV_LinkEdict_TouchAreaGr
        if(this.solid == SOLID_NOT)
                return;
 
-    FOREACH_ENTITY_RADIUS(0.5 * (this.absmin + this.absmax), 0.5 * vlen(this.absmax - this.absmin), true, {
+    FOREACH_ENTITY_RADIUS_ORDERED(0.5 * (this.absmin + this.absmax), 0.5 * vlen(this.absmax - this.absmin), true, {
                if (it.solid == SOLID_TRIGGER && it != this)
                if (it.move_nomonsters != MOVE_NOMONSTERS && it.move_nomonsters != MOVE_WORLDONLY)
                if (gettouch(it) && boxesoverlap(it.absmin, it.absmax, this.absmin, this.absmax))