thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-26 12:01:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

M_ChallengesTick: Catch one more SKINCOLOR_NONE opportunity for bombcolor

Browse source 
Also clarifies the SECRET_FOLLOWER case a little
This commit is contained in:
toaster 2023-04-23 21:21:12 +01:00
parent c486ec19af
commit 0fe6fb2fa5
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -459,11 +459,13 @@ void M_ChallengesTick(void)
} }
case SECRET_FOLLOWER: case SECRET_FOLLOWER:
{ {
INT32 skin = M_UnlockableFollowerNum(ref); INT32 fskin = M_UnlockableFollowerNum(ref);
if (skin != -1) if (fskin != -1)
{ {
INT32 psk = R_SkinAvailable(cv_skin[0].string); INT32 psk = R_SkinAvailable(cv_skin[0].string);
bombcolor = K_GetEffectiveFollowerColor(followers[skin].defaultcolor, &followers[skin], cv_playercolor[0].value, (psk != -1) ? &skins[psk] : &skins[0]); if (psk == -1)
psk = 0;
bombcolor = K_GetEffectiveFollowerColor(followers[fskin].defaultcolor, &followers[fskin], cv_playercolor[0].value, &skins[psk]);
} }
break; break;
} }
@ -474,6 +476,13 @@ void M_ChallengesTick(void)
if (bombcolor == SKINCOLOR_NONE) if (bombcolor == SKINCOLOR_NONE)
{ {
bombcolor = cv_playercolor[0].value; bombcolor = cv_playercolor[0].value;
if (bombcolor == SKINCOLOR_NONE)
{
INT32 psk = R_SkinAvailable(cv_skin[0].string);
if (psk == -1)
psk = 0;
bombcolor = skins[psk].prefcolor;
}
} }
i = (ref->majorunlock && M_RandomChance(FRACUNIT/2)) ? 1 : 0; i = (ref->majorunlock && M_RandomChance(FRACUNIT/2)) ? 1 : 0;