Merge branch 'f12fix' into 'master'

Fix F12 issues

Closes #356 and #377

See merge request STJr/SRB2Internal!616
This commit is contained in:
MascaraSnake 2019-12-06 15:01:28 -05:00
commit 201cdef381
3 changed files with 14 additions and 17 deletions

View file

@ -3790,10 +3790,7 @@ boolean P_CameraThinker(player_t *player, camera_t *thiscam, boolean resetcalled
dummy.z = thiscam->z;
dummy.height = thiscam->height;
if (!resetcalled && !(player->pflags & PF_NOCLIP) && !P_CheckSight(&dummy, player->mo)) // TODO: "P_CheckCameraSight" instead.
{
P_ResetCamera(player, thiscam);
resetcalled = true;
}
else
{
fixed_t camspeed = P_AproxDistance(thiscam->momx, thiscam->momy);