Merge branch 'fix-rivals-again' into 'master'

Fix Rivals & Tutorial Again

Closes #1359

See merge request KartKrew/Kart!2344
This commit is contained in:
Oni 2024-05-03 01:21:51 +00:00
commit fbf252b6b6

View file

@ -6150,27 +6150,21 @@ boolean TryRunTics(tic_t realtics)
ps_tictime = I_GetPreciseTime() - ps_tictime; ps_tictime = I_GetPreciseTime() - ps_tictime;
if (F_IsDeferredContinueCredits())
{
F_ContinueCredits();
}
if (D_IsDeferredStartTitle())
{
D_StartTitle();
}
// Leave a certain amount of tics present in the net buffer as long as we've ran at least one tic this frame. // Leave a certain amount of tics present in the net buffer as long as we've ran at least one tic this frame.
if (client && gamestate == GS_LEVEL && leveltime > 1 && neededtic <= gametic + cv_netticbuffer.value) if (client && gamestate == GS_LEVEL && leveltime > 1 && neededtic <= gametic + cv_netticbuffer.value)
{ {
break; break;
} }
}
// if we're no longer in a level state, just exit if (F_IsDeferredContinueCredits())
if (!G_GamestateUsesLevel()) {
{ F_ContinueCredits();
break; }
}
if (D_IsDeferredStartTitle())
{
D_StartTitle();
} }
} }
else else