From: Rudolf Polzer <divverent@alientrap.org>
Date: Fri, 30 Dec 2011 20:01:59 +0000 (+0100)
Subject: fix bugs with conveyor and some items
X-Git-Tag: xonotic-v0.6.0~42^2~7^2~23
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a51f6861c729ce47a5a196c4139ba7bc71e30077;p=xonotic%2Fxonotic-data.pk3dir.git

fix bugs with conveyor and some items
---

diff --git a/qcsrc/server/t_plats.qc b/qcsrc/server/t_plats.qc
index b0450eb2e..a556d6d0b 100644
--- a/qcsrc/server/t_plats.qc
+++ b/qcsrc/server/t_plats.qc
@@ -2067,7 +2067,7 @@ 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)
-				if(e.movetype != MOVETYPE_NONE)
+				if(isPushable(e))
 				{
 					vector emin = e.absmin;
 					vector emax = e.absmax;
@@ -2086,8 +2086,9 @@ 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;
+			setorigin(e, e.origin + self.movedir * sys_frametime);
 			move_out_of_solid(e);
+			UpdateCSQCProjectile(e);
 			/*
 			// stupid conveyor code
 			tracebox(e.origin, e.mins, e.maxs, e.origin + self.movedir * sys_frametime, MOVE_NORMAL, e);