From 1d693fb13d2d664d7c85aacdb1dee47b617b5fd3 Mon Sep 17 00:00:00 2001
From: Christopher Schwarz <lakitu7@gmail.com>
Date: Sun, 23 Jan 2011 21:08:02 +0000
Subject: * Fix for the camera freaking out when a wallwalker gets too close to
 another player (with thanks to kevlarman and Timbo)

---
 src/game/bg_pmove.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/game')

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:
-- 
cgit