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 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 2bd75f0c4..b57cffc2c 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -3622,7 +3622,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);