From 946beabdf6ff124451a175d0861996980c247b0b Mon Sep 17 00:00:00 2001 From: toaster Date: Sun, 22 May 2022 22:25:17 +0100 Subject: [PATCH 1/2] Fix lookback interpolating # Conflicts: # src/p_setup.c # src/r_fps.c --- src/p_setup.c | 4 ++++ src/p_user.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/p_setup.c b/src/p_setup.c index baba85ee8..c1da43eef 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -4509,6 +4509,10 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate) if (rendermode == render_none || reloadinggamestate) return true; + R_ResetViewInterpolation(0); + R_ResetViewInterpolation(0); + R_UpdateMobjInterpolators(); + // Title card! G_StartTitleCard(); diff --git a/src/p_user.c b/src/p_user.c index 145835e48..31426e455 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -3593,7 +3593,11 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall } if (lookbackdown) + { P_MoveChaseCamera(player, thiscam, false); + R_ResetViewInterpolation(num + 1); + R_ResetViewInterpolation(num + 1); + } return (x == thiscam->x && y == thiscam->y && z == thiscam->z && angle == thiscam->aiming); From 4f9642f537eb78d085325a503dfa338f233e852b Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Wed, 4 May 2022 05:20:32 -0400 Subject: [PATCH 2/2] Do not register servers twice Advertise_OnChange is CV_NETVAR, so the server will get registered by CV_LoadNetVars when the server starts. This race condition occasionally pops up in master, but got very consistent with uncapped. --- src/d_clisrv.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/d_clisrv.c b/src/d_clisrv.c index e5321d225..b03eb478e 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -3599,10 +3599,6 @@ boolean SV_SpawnServer(void) if (netgame && I_NetOpenSocket) { I_NetOpenSocket(); -#ifdef MASTERSERVER - if (cv_advertise.value) - RegisterServer(); -#endif } // non dedicated server just connect to itself