mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2026-04-27 20:41:46 +00:00
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:
commit
1990c10635
5 changed files with 16 additions and 4 deletions
|
|
@ -6090,6 +6090,11 @@ boolean TryRunTics(tic_t realtics)
|
||||||
|
|
||||||
ps_tictime = I_GetPreciseTime() - ps_tictime;
|
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.
|
// 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)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -1128,7 +1128,7 @@ void D_StartTitle(void)
|
||||||
D_ClearState();
|
D_ClearState();
|
||||||
F_StartTitleScreen();
|
F_StartTitleScreen();
|
||||||
M_ClearMenus(false);
|
M_ClearMenus(false);
|
||||||
g_deferredtitle = true;
|
g_deferredtitle = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void D_SetDeferredStartTitle(boolean deferred)
|
void D_SetDeferredStartTitle(boolean deferred)
|
||||||
|
|
|
||||||
|
|
@ -3920,11 +3920,9 @@ boolean G_CheckDemoStatus(void)
|
||||||
else if (demo.attract == DEMO_ATTRACT_CREDITS)
|
else if (demo.attract == DEMO_ATTRACT_CREDITS)
|
||||||
F_ContinueCredits();
|
F_ContinueCredits();
|
||||||
else
|
else
|
||||||
D_StartTitle();
|
D_SetDeferredStartTitle(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
demo.attract = DEMO_ATTRACT_OFF;
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -366,6 +366,9 @@ static void F_InitCreditsSlide(void)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// Clear the console hud just to avoid anything getting in the way.
|
||||||
|
CON_ClearHUD();
|
||||||
}
|
}
|
||||||
|
|
||||||
void F_StartCredits(void)
|
void F_StartCredits(void)
|
||||||
|
|
|
||||||
|
|
@ -12,6 +12,7 @@
|
||||||
/// \brief Archiving: SaveGame I/O, Thinker, Ticker
|
/// \brief Archiving: SaveGame I/O, Thinker, Ticker
|
||||||
|
|
||||||
#include "doomstat.h"
|
#include "doomstat.h"
|
||||||
|
#include "d_main.h"
|
||||||
#include "g_game.h"
|
#include "g_game.h"
|
||||||
#include "g_input.h"
|
#include "g_input.h"
|
||||||
#include "p_local.h"
|
#include "p_local.h"
|
||||||
|
|
@ -1252,5 +1253,10 @@ void P_Ticker(boolean run)
|
||||||
{
|
{
|
||||||
G_CopyTiccmd(&players[i].oldcmd, &players[i].cmd, 1);
|
G_CopyTiccmd(&players[i].oldcmd, &players[i].cmd, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (D_IsDeferredStartTitle())
|
||||||
|
{
|
||||||
|
D_StartTitle();
|
||||||
|
}
|
||||||
// Z_CheckMemCleanup();
|
// Z_CheckMemCleanup();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue