From e21182ccfc0c937e3d45f8d05f5efdfd11ecc1ac Mon Sep 17 00:00:00 2001 From: Alug Date: Sun, 13 Oct 2024 21:47:56 +0200 Subject: [PATCH] fix the cam loops --- src/p_user.c | 34 +++++++++++++--------------------- src/r_main.c | 21 +++++++-------------- 2 files changed, 20 insertions(+), 35 deletions(-) diff --git a/src/p_user.c b/src/p_user.c index 5db29fa95..f76ff405e 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -3338,19 +3338,17 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall if (!thiscam->chase && !resetcalled) { + focusangle = mo->angle; for (i = 0; i <= splitscreen; i++) { - if (player == &players[displayplayers[i]]) + if (player == (i == 0 ? &players[consoleplayer] : &players[displayplayers[i]])) { focusangle = localangle[i]; break; } - else - { - focusangle = mo->angle; - } } + camrotate = 0; for (i = 0; i <= splitscreen; i++) { if (thiscam == &camera[i]) @@ -3358,10 +3356,6 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall camrotate = cv_cam_rotate[i].value; break; } - else - { - camrotate = 0; - } } if (leveltime < introtime) // Whoooshy camera! @@ -3390,19 +3384,17 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall } else { - for (i = 0; i <= splitscreen; i++) + focusangle = mo->angle; + focusaiming = player->aiming; + } + + for (i = 0; i <= splitscreen; i++) + { + if (player == (i == 0 ? &players[consoleplayer] : &players[displayplayers[i]])) { - if (player == &players[displayplayers[i]]) - { - focusangle = localangle[i]; - focusaiming = localaiming[i]; - break; - } - else - { - focusangle = mo->angle; - focusaiming = player->aiming; - } + focusangle = localangle[i]; + focusaiming = localaiming[i]; + break; } } diff --git a/src/r_main.c b/src/r_main.c index b3bcbafc7..ec9781ff9 100644 --- a/src/r_main.c +++ b/src/r_main.c @@ -1079,7 +1079,7 @@ static void R_SetupAimingFrame(player_t *player, camera_t *thiscam) { for (UINT8 i = 0; i <= splitscreen; i++) { - if (player == &players[displayplayers[i]]) + if (player == (i == 0 ? &players[consoleplayer] : &players[displayplayers[i]])) { newview->angle = localangle[i]; newview->aim = localaiming[i]; @@ -1095,22 +1095,15 @@ void R_SkyboxFrame(player_t *player) camera_t *thiscam = &camera[0]; UINT8 i; - if (splitscreen) + for (i = 0; i <= splitscreen; i++) { - for (i = 0; i <= splitscreen; i++) + if (player == (i == 0 ? &players[consoleplayer] : &players[displayplayers[i]])) { - if (player == &players[displayplayers[i]]) - { - thiscam = &camera[i]; - R_SetViewContext(VIEWCONTEXT_SKY1 + i); - break; - } + thiscam = &camera[i]; + R_SetViewContext(VIEWCONTEXT_SKY1 + i); + break; } } - else - { - R_SetViewContext(VIEWCONTEXT_SKY1); - } // cut-away view stuff newview->sky = true; @@ -1205,7 +1198,7 @@ void R_SetupFrame(player_t *player, boolean skybox) for (UINT8 i = 0; i <= splitscreen; i++) { - if (player == &players[displayplayers[i]]) + if (player == (i == 0 ? &players[consoleplayer] : &players[displayplayers[i]])) { thiscam = &camera[i]; chasecam = cv_chasecam[i].value;