From 326955dd30a9f61b0c489356faac39a31cfd0296 Mon Sep 17 00:00:00 2001 From: TehRealSalt Date: Wed, 24 Oct 2018 21:05:02 -0400 Subject: [PATCH] Turn cam on wall hit --- src/p_map.c | 5 +++++ src/p_mobj.c | 2 ++ 2 files changed, 7 insertions(+) diff --git a/src/p_map.c b/src/p_map.c index 468a5c67..4aed4db6 100644 --- a/src/p_map.c +++ b/src/p_map.c @@ -2381,6 +2381,11 @@ boolean P_TryCameraMove(fixed_t x, fixed_t y, camera_t *thiscam) || (thiscam == &camera3 && (players[thirddisplayplayer].pflags & PF_NOCLIP)) || (thiscam == &camera4 && (players[fourthdisplayplayer].pflags & PF_NOCLIP)) || (leveltime < introtime)) +#else + if ((thiscam == &camera && !(players[displayplayer].pflags & PF_TIMEOVER)) + || (thiscam == &camera2 && !(players[secondarydisplayplayer].pflags & PF_TIMEOVER)) + || (thiscam == &camera3 && !(players[thirddisplayplayer].pflags & PF_TIMEOVER)) + || (thiscam == &camera4 && !(players[fourthdisplayplayer].pflags & PF_TIMEOVER))) #endif { // Noclipping player camera noclips too!! floatok = true; diff --git a/src/p_mobj.c b/src/p_mobj.c index 42c46622..2f91d312 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -3709,6 +3709,8 @@ boolean P_CameraThinker(player_t *player, camera_t *thiscam, boolean resetcalled dummy.y = thiscam->y; dummy.z = thiscam->z; dummy.height = thiscam->height; + if (player->pflags & PF_TIMEOVER) + player->kartstuff[k_timeovercam] = 2*TICRATE; if (!resetcalled && !(player->pflags & PF_NOCLIP || leveltime < introtime) && !P_CheckSight(&dummy, player->mo)) // TODO: "P_CheckCameraSight" instead. P_ResetCamera(player, thiscam); else