From 166efa2a57dfe38df0b0d10de6ecc6291936396e Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Thu, 29 Dec 2011 23:13:22 +0100 Subject: [PATCH] new conveyor code: don't push each other --- qcsrc/server/t_plats.qc | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/qcsrc/server/t_plats.qc b/qcsrc/server/t_plats.qc index 6b85d209c..32975c146 100644 --- a/qcsrc/server/t_plats.qc +++ b/qcsrc/server/t_plats.qc @@ -2068,13 +2068,14 @@ void conveyor_think() { for(e = findradius((self.absmin + self.absmax) * 0.5, vlen(self.absmax - self.absmin) * 0.5); e; e = e.chain) if(!e.conveyor.state) - { - vector emin = e.absmin - '1 1 1'; - vector emax = e.absmax + '1 1 1'; - if(boxesoverlap(emin, emax, self.absmin, self.absmax)) // quick - if(WarpZoneLib_BoxTouchesBrush(emin, emax, self, e)) // accurate - e.conveyor = self; - } + if(e.movetype != MOVETYPE_NONE) + { + vector emin = e.absmin - '1 1 1'; + vector emax = e.absmax + '1 1 1'; + if(boxesoverlap(emin, emax, self.absmin, self.absmax)) // quick + if(WarpZoneLib_BoxTouchesBrush(emin, emax, self, e)) // accurate + e.conveyor = self; + } for(e = world; (e = findentity(e, conveyor, self)); ) { -- 2.39.2