summaryrefslogtreecommitdiff
path: root/src/game
diff options
context:
space:
mode:
Diffstat (limited to 'src/game')
-rw-r--r--src/game/bg_pmove.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/game/bg_pmove.c b/src/game/bg_pmove.c
index c9fb044d..0c29d55d 100644
--- a/src/game/bg_pmove.c
+++ b/src/game/bg_pmove.c
@@ -1971,8 +1971,10 @@ static void PM_GroundClimbTrace( void )
case 1:
//trace straight down anto "ground" surface
+ //mask out CONTENTS_BODY to not hit other players and avoid the camera flipping out when
+ // wallwalkers touch
VectorMA( pm->ps->origin, -0.25f, surfNormal, point );
- pm->trace( &trace, pm->ps->origin, pm->mins, pm->maxs, point, pm->ps->clientNum, pm->tracemask );
+ pm->trace( &trace, pm->ps->origin, pm->mins, pm->maxs, point, pm->ps->clientNum, pm->tracemask & ~CONTENTS_BODY );
break;
case 2: