From 15072adc0dde692b4d44f82bb2bbdef540702c74 Mon Sep 17 00:00:00 2001 From: Mario Date: Sat, 12 Mar 2016 22:00:07 +1000 Subject: [PATCH] Tweak touch handling of physics a little --- qcsrc/common/physics/movetypes/movetypes.qc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/qcsrc/common/physics/movetypes/movetypes.qc b/qcsrc/common/physics/movetypes/movetypes.qc index ce469ed6a..ec2761431 100644 --- a/qcsrc/common/physics/movetypes/movetypes.qc +++ b/qcsrc/common/physics/movetypes/movetypes.qc @@ -343,11 +343,11 @@ void _Movetype_LinkEdict_TouchAreaGrid(entity this) // SV_LinkEdict_TouchAreaGr entity oldother = other; - for (entity e = findradius(0.5 * (this.absmin + this.absmax), 0.5 * vlen(this.absmax - this.absmin)); e; e = e.chain) + FOREACH_ENTITY_FLOAT(solid, SOLID_TRIGGER, { - if(e.solid == SOLID_TRIGGER && e != this) - if(e.move_nomonsters != MOVE_NOMONSTERS && e.move_nomonsters != MOVE_WORLDONLY) - if(e.move_touch && boxesoverlap(e.absmin, e.absmax, this.absmin, this.absmax)) + if(it != this && it.move_touch) + if(it.move_nomonsters != MOVE_NOMONSTERS && it.move_nomonsters != MOVE_WORLDONLY) + if(boxesoverlap(it.absmin, it.absmax, this.absmin, this.absmax)) { other = this; @@ -356,14 +356,14 @@ void _Movetype_LinkEdict_TouchAreaGrid(entity this) // SV_LinkEdict_TouchAreaGr trace_fraction = 1; trace_inwater = false; trace_inopen = true; - trace_endpos = e.move_origin; + trace_endpos = it.move_origin; trace_plane_normal = '0 0 1'; trace_plane_dist = 0; trace_ent = this; - WITH(entity, self, e, e.move_touch()); + WITH(entity, self, it, it.move_touch()); } - } + }); other = oldother; } -- 2.39.2