mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-10-30 08:01:28 +00:00
Merge branch 'title-attract-slide-fix' into 'master'
Fix attract title logo slidein (resolves #1273) Closes #1273 See merge request KartKrew/Kart!2287
This commit is contained in:
commit
d4877c298f
2 changed files with 5 additions and 3 deletions
|
|
@ -7645,7 +7645,9 @@ static void P_InitLevelSettings(void)
|
|||
|
||||
// circuit, race and competition stuff
|
||||
numcheatchecks = 0;
|
||||
timeinmap = 0;
|
||||
|
||||
if (!g_reloadinggamestate)
|
||||
timeinmap = 0;
|
||||
|
||||
// special stage
|
||||
stagefailed = true; // assume failed unless proven otherwise - P_GiveEmerald or emerald touchspecial
|
||||
|
|
|
|||
|
|
@ -1516,10 +1516,10 @@ static fixed_t ST_CalculateFadeIn(player_t *player)
|
|||
|
||||
if (K_CheckBossIntro() == true || G_IsTitleCardAvailable() == false)
|
||||
{
|
||||
if (leveltime <= 16)
|
||||
if (timeinmap <= 16)
|
||||
timer = 0;
|
||||
else
|
||||
timer = leveltime-16;
|
||||
timer = timeinmap-16;
|
||||
}
|
||||
|
||||
if (timer < length)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue