fix bugs with conveyor and some items

diff --git a/qcsrc/server/t_plats.qc b/qcsrc/server/t_plats.qc
index b0450eb2e20583355db0bc0b8c65e853d70c9b40..a556d6d0bb192dd72d9417d2535a7eafa3e82aac 100644 (file)
--- 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);