Merge branch 'title-tempest' into 'master'

Title and Credits attract fixes

Closes #1056 and #1055

See merge request KartKrew/Kart!1950
This commit is contained in:
Oni 2024-02-29 10:25:25 +00:00
commit 1990c10635
5 changed files with 16 additions and 4 deletions

View file

@ -6090,6 +6090,11 @@ boolean TryRunTics(tic_t realtics)
ps_tictime = I_GetPreciseTime() - ps_tictime;
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.
if (client && gamestate == GS_LEVEL && leveltime > 1 && neededtic <= gametic + cv_netticbuffer.value)
{

View file

@ -1128,7 +1128,7 @@ void D_StartTitle(void)
D_ClearState();
F_StartTitleScreen();
M_ClearMenus(false);
g_deferredtitle = true;
g_deferredtitle = false;
}
void D_SetDeferredStartTitle(boolean deferred)

View file

@ -3920,11 +3920,9 @@ boolean G_CheckDemoStatus(void)
else if (demo.attract == DEMO_ATTRACT_CREDITS)
F_ContinueCredits();
else
D_StartTitle();
D_SetDeferredStartTitle(true);
}
demo.attract = DEMO_ATTRACT_OFF;
return true;
}

View file

@ -366,6 +366,9 @@ static void F_InitCreditsSlide(void)
}
}
#endif
// Clear the console hud just to avoid anything getting in the way.
CON_ClearHUD();
}
void F_StartCredits(void)

View file

@ -12,6 +12,7 @@
/// \brief Archiving: SaveGame I/O, Thinker, Ticker
#include "doomstat.h"
#include "d_main.h"
#include "g_game.h"
#include "g_input.h"
#include "p_local.h"
@ -1252,5 +1253,10 @@ void P_Ticker(boolean run)
{
G_CopyTiccmd(&players[i].oldcmd, &players[i].cmd, 1);
}
if (D_IsDeferredStartTitle())
{
D_StartTitle();
}
// Z_CheckMemCleanup();
}