From 3c5012e768a5807a06d8a6d78b4f93d6767b7770 Mon Sep 17 00:00:00 2001 From: aurhat Date: Fri, 7 Oct 2016 23:41:03 +0200 Subject: [PATCH] Don't check collision during spectating in 1st person view It fixes the problem, that during spectating in 1st person view, when spectated player collided (for example with wall) and crouched, then his crouches weren't visible for player1. --- source/src/physics.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/src/physics.cpp b/source/src/physics.cpp index debd9e02..ac8ce99a 100644 --- a/source/src/physics.cpp +++ b/source/src/physics.cpp @@ -366,7 +366,7 @@ void resizephysent(physent *pl, int moveres, int curtime, float min, float max) { pl->eyeheight += h; pl->o.z += h; - if(collide(pl)) + if(collide(pl) && !(pl != player1 && player1->isspectating() && player1->spectatemode==SM_FOLLOW1ST)) // don't check collision during spectating in 1st person view { pl->eyeheight -= h; // collided, revert mini-step pl->o.z -= h;