From 4a26aec031eafaac5b584887bd4e7ebc87421c6f Mon Sep 17 00:00:00 2001 From: lachwright Date: Sat, 7 Dec 2019 02:27:48 +0800 Subject: [PATCH] Actually fix F12 issues --- src/p_mobj.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/p_mobj.c b/src/p_mobj.c index a7b48aaa4..30cf95ccc 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -3790,21 +3790,18 @@ 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 if (!resetcalled) + else { fixed_t camspeed = P_AproxDistance(thiscam->momx, thiscam->momy); P_SlideCameraMove(thiscam); - if (P_AproxDistance(thiscam->momx, thiscam->momy) == camspeed) - { - P_ResetCamera(player, thiscam); - resetcalled = true; - } + if (!resetcalled && P_AproxDistance(thiscam->momx, thiscam->momy) == camspeed) + { + P_ResetCamera(player, thiscam); + resetcalled = true; + } } if (resetcalled) // Okay this means the camera is fully reset. return true;