thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

M_ChallengesTick: Fix no in-fade if only Chao Keys are pending

Browse source
This commit is contained in:
toaster 2023-03-14 11:34:07 +00:00
parent db1b3dd7c9
commit 1fb0e0454f
1 changed files with 67 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/menus/extras-challenges.c
View file

@ -323,7 +323,12 @@ void M_ChallengesTick(void)
} }
} }
if (challengesmenu.chaokeyadd == true) if (challengesmenu.pending && challengesmenu.fade < 5)
{
// Fade increase.
challengesmenu.fade++;
}
else if (challengesmenu.chaokeyadd == true)
{ {
if (challengesmenu.ticker <= 5) if (challengesmenu.ticker <= 5)
; // recreate the slight delay the unlock fades provide ; // recreate the slight delay the unlock fades provide
@ -376,15 +381,6 @@ void M_ChallengesTick(void)
} }
else if (challengesmenu.pending) else if (challengesmenu.pending)
{ {
// Pending mode.
if (challengesmenu.fade < 5)
{
// Fade increase.
challengesmenu.fade++;
}
else
{
// Unlock sequence.
tic_t nexttime = M_MenuExtraHeld(pid) ? (UNLOCKTIME*2) : MAXUNLOCKTIME; tic_t nexttime = M_MenuExtraHeld(pid) ? (UNLOCKTIME*2) : MAXUNLOCKTIME;
if (++challengesmenu.unlockanim >= nexttime) if (++challengesmenu.unlockanim >= nexttime)
@ -459,7 +455,6 @@ void M_ChallengesTick(void)
} }
} }
} }
}
else else
{ {