From ceed76cc732482ef6a9c071a1d6c762f5437e2c9 Mon Sep 17 00:00:00 2001 From: NepDisk Date: Mon, 24 Mar 2025 14:24:03 -0400 Subject: [PATCH] Repair parties for blankart --- src/d_clisrv.c | 3 --- src/g_game.c | 6 ++++-- src/p_user.c | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/d_clisrv.c b/src/d_clisrv.c index b541c8c59..8f7cc84f6 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -3619,9 +3619,6 @@ static void Got_AddPlayer(UINT8 **p, INT32 playernum) players[newplayernum].splitscreenindex = splitscreenplayer; players[newplayernum].bot = false; - playerconsole[newplayernum] = console; - G_BuildLocalSplitscreenParty(newplayernum); - if (netgame) { char joinmsg[256]; diff --git a/src/g_game.c b/src/g_game.c index afff8e8dd..ed7bd846d 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -950,15 +950,17 @@ angle_t localangle[MAXSPLITSCREENPLAYERS]; // This brings back the camera prediction that was lost. static void G_DoAnglePrediction(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer, player_t *player) { + UINT8 viewnum = G_PartyPosition(g_localplayers[ssplayer-1]); + if (player->mo) cmd->angle = K_GetKartTurnValue(player, cmd->turning); cmd->angle *= realtics; if (P_CanPlayerTurn(player, cmd)) - localangle[ssplayer-1] += (cmd->angle<angle<angle = (INT16)(localangle[ssplayer-1] >> TICCMD_REDUCE); + cmd->angle = (INT16)(localangle[viewnum] >> TICCMD_REDUCE); } void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer) diff --git a/src/p_user.c b/src/p_user.c index 8ebfd00cd..37aaff733 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -2913,7 +2913,7 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall focusangle = player->cmd.angle << TICCMD_REDUCE; focusaiming = 0; } - else if (P_IsLocalPlayer(player)) + else if (P_IsMachineLocalPlayer(player)) { focusangle = localangle[num]; focusaiming = localaiming[num];