From 7ec4a42d9f7dbb28a3932c13d5a1b9f01a3af919 Mon Sep 17 00:00:00 2001 From: mazmazz Date: Mon, 12 Nov 2018 20:37:55 -0500 Subject: [PATCH] Force chasecam for tutorialmode --- src/p_user.c | 2 +- src/r_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/p_user.c b/src/p_user.c index e0534395a..f4bfd4c61 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -8785,7 +8785,7 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall cameranoclip = (player->powers[pw_carry] == CR_NIGHTSMODE || player->pflags & PF_NOCLIP) || (mo->flags & (MF_NOCLIP|MF_NOCLIPHEIGHT)); // Noclipping player camera noclips too!! - if (!(player->climbing || (player->powers[pw_carry] == CR_NIGHTSMODE) || player->playerstate == PST_DEAD)) + if (!(player->climbing || (player->powers[pw_carry] == CR_NIGHTSMODE) || player->playerstate == PST_DEAD || tutorialmode)) { if (player->spectator) // force cam off for spectators return true; diff --git a/src/r_main.c b/src/r_main.c index bfca180d0..98ce978a6 100644 --- a/src/r_main.c +++ b/src/r_main.c @@ -913,7 +913,7 @@ void R_SetupFrame(player_t *player, boolean skybox) chasecam = (cv_chasecam.value != 0); } - if (player->climbing || (player->powers[pw_carry] == CR_NIGHTSMODE) || player->playerstate == PST_DEAD || gamestate == GS_TITLESCREEN) + if (player->climbing || (player->powers[pw_carry] == CR_NIGHTSMODE) || player->playerstate == PST_DEAD || gamestate == GS_TITLESCREEN || tutorialmode) chasecam = true; // force chasecam on else if (player->spectator) // no spectator chasecam chasecam = false; // force chasecam off