From 8b7c171a672963b8017a45a1ed89f6441ec7ce0b Mon Sep 17 00:00:00 2001 From: Alug Date: Sun, 1 Dec 2024 10:28:58 +0100 Subject: [PATCH] better fix for G_FixCamera completely forgor in kart and srb2.1 cmd.angleturn needs to be bitshifted to accomidate localangle using it again is better, since player mobj angle is not always suitable for localangle and may slightly mismatch where a player is steering --- src/d_clisrv.c | 2 +- src/g_game.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/d_clisrv.c b/src/d_clisrv.c index 37323b376..5c2b2d65b 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -1839,7 +1839,7 @@ static void CL_ReloadReceivedSavegame(void) // we dont have P_ForceLocalAngle so were setting it manually here for (i = 0; i <= splitscreen; i++) { - localangle[i] = (angle_t)(players[displayplayers[i]].cmd.angleturn<<16); + localangle[i] = (angle_t)(players[displayplayers[i]].cmd.angleturn << 16); } for (i = 0; i < MAXSPLITSCREENPLAYERS; i++) diff --git a/src/g_game.c b/src/g_game.c index c34c29772..ffcb7d9dd 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -1689,10 +1689,7 @@ static void G_FixCamera(UINT8 view) // The order of displayplayers can change, which would // invalidate localangle. - if (player->mo) - localangle[view - 1] = player->mo->angle; // Players *always* have mobjs, right? // nope it seems - else - localangle[view - 1] = player->cmd.angleturn; + localangle[view - 1] = (angle_t)(player->cmd.angleturn << 16); P_ResetCamera(player, &camera[view - 1]); // Make sure the viewport doesn't interpolate at all into