Merge branch 'lookback-snapback' into 'master'

Fix lookback interpolating

See merge request KartKrew/Kart!596
This commit is contained in:
Sal 2022-05-23 00:19:50 +00:00
commit e492a04976
3 changed files with 8 additions and 4 deletions

View file

@ -3599,10 +3599,6 @@ boolean SV_SpawnServer(void)
if (netgame && I_NetOpenSocket) if (netgame && I_NetOpenSocket)
{ {
I_NetOpenSocket(); I_NetOpenSocket();
#ifdef MASTERSERVER
if (cv_advertise.value)
RegisterServer();
#endif
} }
// non dedicated server just connect to itself // non dedicated server just connect to itself

View file

@ -4509,6 +4509,10 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate)
if (rendermode == render_none || reloadinggamestate) if (rendermode == render_none || reloadinggamestate)
return true; return true;
R_ResetViewInterpolation(0);
R_ResetViewInterpolation(0);
R_UpdateMobjInterpolators();
// Title card! // Title card!
G_StartTitleCard(); G_StartTitleCard();

View file

@ -3622,7 +3622,11 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
} }
if (lookbackdown) if (lookbackdown)
{
P_MoveChaseCamera(player, thiscam, false); 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); return (x == thiscam->x && y == thiscam->y && z == thiscam->z && angle == thiscam->aiming);