diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/cgame/cg_predict.c | 3 | ||||
| -rw-r--r-- | src/server/sv_world.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/cgame/cg_predict.c b/src/cgame/cg_predict.c index af48bf96..b268431f 100644 --- a/src/cgame/cg_predict.c +++ b/src/cgame/cg_predict.c @@ -176,7 +176,10 @@ static void CG_ClipMoveToEntities ( const vec3_t start, const vec3_t mins, *tr = trace; } else if( trace.startsolid ) + { tr->startsolid = qtrue; + tr->entityNum = ent->number; + } if( tr->allsolid ) return; diff --git a/src/server/sv_world.c b/src/server/sv_world.c index c10f1e92..f1ca74e0 100644 --- a/src/server/sv_world.c +++ b/src/server/sv_world.c @@ -566,10 +566,10 @@ static void SV_ClipMoveToEntities( moveclip_t *clip ) { if ( trace.allsolid ) { clip->trace.allsolid = qtrue; - trace.entityNum = touch->s.number; + clip->trace.entityNum = touch->s.number; } else if ( trace.startsolid ) { clip->trace.startsolid = qtrue; - trace.entityNum = touch->s.number; + clip->trace.entityNum = touch->s.number; } if ( trace.fraction < clip->trace.fraction ) { |