From: Rudolf Polzer <divverent@alientrap.org>
Date: Fri, 30 Dec 2011 19:15:38 +0000 (+0100)
Subject: conveyor: make it more clever for regular ents too
X-Git-Tag: xonotic-v0.6.0~42^2~7^2~24
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cbe42c13cf1a4e69599e831a40af8a3aaf57ed8f;p=xonotic%2Fxonotic-data.pk3dir.git

conveyor: make it more clever for regular ents too
---

diff --git a/qcsrc/server/t_plats.qc b/qcsrc/server/t_plats.qc
index 30f425bfc..b0450eb2e 100644
--- a/qcsrc/server/t_plats.qc
+++ b/qcsrc/server/t_plats.qc
@@ -2086,10 +2086,14 @@ void conveyor_think()
 			if(e.flags & FL_CLIENT) // doing it via velocity has quite some advantages
 				continue; // done in SV_PlayerPhysics
 
+			e.origin += self.movedir * sys_frametime;
+			move_out_of_solid(e);
+			/*
 			// stupid conveyor code
 			tracebox(e.origin, e.mins, e.maxs, e.origin + self.movedir * sys_frametime, MOVE_NORMAL, e);
 			if(trace_fraction > 0)
 				setorigin(e, trace_endpos);
+			*/
 		}
 	}