summaryrefslogtreecommitdiff
path: root/src/game/bg_slidemove.c
diff options
context:
space:
mode:
author/dev/humancontroller <devhc@example.com>2014-07-13 19:30:20 +0200
committer/dev/humancontroller <devhc@example.com>2017-03-09 13:51:14 +0100
commit070a12bff30c69b104edb0e9586df4eff9a75fc1 (patch)
treea985f381927d803d2bfc640ee754ed31fa98cd0c /src/game/bg_slidemove.c
parent11dd8874c42785feaf020679320ae9de7e226adb (diff)
do not overclip
Diffstat (limited to 'src/game/bg_slidemove.c')
-rw-r--r--src/game/bg_slidemove.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/game/bg_slidemove.c b/src/game/bg_slidemove.c
index f396ba66..cd770589 100644
--- a/src/game/bg_slidemove.c
+++ b/src/game/bg_slidemove.c
@@ -74,8 +74,7 @@ qboolean PM_SlideMove( qboolean gravity )
if( pml.groundPlane )
{
// slide along the ground plane
- PM_ClipVelocity( pm->ps->velocity, pml.groundTrace.plane.normal,
- pm->ps->velocity, OVERCLIP );
+ PM_ClipVelocity( pm->ps->velocity, pml.groundTrace.plane.normal, pm->ps->velocity );
}
}
@@ -166,10 +165,10 @@ qboolean PM_SlideMove( qboolean gravity )
pml.impactSpeed = -into;
// slide along the plane
- PM_ClipVelocity( pm->ps->velocity, planes[ i ], clipVelocity, OVERCLIP );
+ PM_ClipVelocity( pm->ps->velocity, planes[ i ], clipVelocity );
// slide along the plane
- PM_ClipVelocity( endVelocity, planes[ i ], endClipVelocity, OVERCLIP );
+ PM_ClipVelocity( endVelocity, planes[ i ], endClipVelocity );
// see if there is a second plane that the new move enters
for( j = 0; j < numplanes; j++ )
@@ -181,8 +180,8 @@ qboolean PM_SlideMove( qboolean gravity )
continue; // move doesn't interact with the plane
// try clipping the move to the plane
- PM_ClipVelocity( clipVelocity, planes[ j ], clipVelocity, OVERCLIP );
- PM_ClipVelocity( endClipVelocity, planes[ j ], endClipVelocity, OVERCLIP );
+ PM_ClipVelocity( clipVelocity, planes[ j ], clipVelocity );
+ PM_ClipVelocity( endClipVelocity, planes[ j ], endClipVelocity );
// see if it goes back into the first clip plane
if( DotProduct( clipVelocity, planes[ i ] ) >= 0 )
@@ -369,7 +368,7 @@ qboolean PM_StepSlideMove( qboolean gravity, qboolean predictive )
VectorCopy( trace.endpos, pm->ps->origin );
if( trace.fraction < 1.0f )
- PM_ClipVelocity( pm->ps->velocity, trace.plane.normal, pm->ps->velocity, OVERCLIP );
+ PM_ClipVelocity( pm->ps->velocity, trace.plane.normal, pm->ps->velocity );
}
if( !predictive && stepped )