diff options
| author | Christopher Schwarz <lakitu7@gmail.com> | 2011-01-23 21:08:02 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:17:53 +0000 |
| commit | 1d693fb13d2d664d7c85aacdb1dee47b617b5fd3 (patch) | |
| tree | e43d6440024bbc744583369a71903b332d826135 /src/game | |
| parent | a363a414e0e1d5c74ba15239b375e4c3e940cc6a (diff) | |
* Fix for the camera freaking out when a wallwalker gets too close to another player (with thanks to kevlarman and Timbo)
Diffstat (limited to 'src/game')
| -rw-r--r-- | src/game/bg_pmove.c | 4 |
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: |