Handle movers in CG_PointContents.fix/cg_pointcontents

This fixes the massive prediction errors that happen on maps where water or lava can move.

1 files changed, 4 insertions, 1 deletions

diff --git a/src/cgame/cg_predict.c b/src/cgame/cg_predict.c
index 0f95ea2..3324a9e 100644
--- a/src/cgame/cg_predict.c
+++ b/src/cgame/cg_predict.c
@@ -253,6 +253,7 @@ int   CG_PointContents( const vec3_t point, int passEntityNum )
   centity_t     *cent;
   clipHandle_t  cmodel;
   int           contents;
+  vec3_t        origin, angles;
 
   contents = trap_CM_PointContents (point, 0);
 
@@ -273,7 +274,9 @@ int   CG_PointContents( const vec3_t point, int passEntityNum )
     if( !cmodel )
       continue;
 
-    contents |= trap_CM_TransformedPointContents( point, cmodel, ent->origin, ent->angles );
+    VectorCopy( cent->lerpAngles, angles );
+    BG_EvaluateTrajectory( &ent->pos, cg.physicsTime, origin );
+    contents |= trap_CM_TransformedPointContents( point, cmodel, origin, angles );
   }
 
   return contents;