mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-10-30 08:01:28 +00:00
Fix attract title logo slidein (resolves #1273)
- V_SLIDEIN: For (G_IsTitleCardAvailable == false)/(versus at map start == true) contexts, use timeinmap instead of leveltime - Don't reset timeinmap when reloading gamestate, so it's more functionally equivalent to lt_ticker These two changes also fix the hypothetical issue of titlecard-less custom gametypes having weird HUD state on late netgame join. Timeinmap is exclusively used for HUD, as is st_fadein. timeinmap also doesn't increment under g_fastforward, therefore the best candidate to tie together
This commit is contained in:
parent
f29ed06e92
commit
db73636f5e
2 changed files with 5 additions and 3 deletions
|
|
@ -7645,6 +7645,8 @@ static void P_InitLevelSettings(void)
|
||||||
|
|
||||||
// circuit, race and competition stuff
|
// circuit, race and competition stuff
|
||||||
numcheatchecks = 0;
|
numcheatchecks = 0;
|
||||||
|
|
||||||
|
if (!g_reloadinggamestate)
|
||||||
timeinmap = 0;
|
timeinmap = 0;
|
||||||
|
|
||||||
// special stage
|
// special stage
|
||||||
|
|
|
||||||
|
|
@ -1516,10 +1516,10 @@ static fixed_t ST_CalculateFadeIn(player_t *player)
|
||||||
|
|
||||||
if (K_CheckBossIntro() == true || G_IsTitleCardAvailable() == false)
|
if (K_CheckBossIntro() == true || G_IsTitleCardAvailable() == false)
|
||||||
{
|
{
|
||||||
if (leveltime <= 16)
|
if (timeinmap <= 16)
|
||||||
timer = 0;
|
timer = 0;
|
||||||
else
|
else
|
||||||
timer = leveltime-16;
|
timer = timeinmap-16;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (timer < length)
|
if (timer < length)
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue