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_CountMedals: Don't count Platinums towards the overall counter, they're explicitly 101%

Browse source 
(This func isn't used by Challenges - M_GotEnoughMedals is, and that doesn't care about AUTOMEDAL_PLATINUM)
This commit is contained in:
toaster 2024-04-05 00:38:58 +01:00
parent de651b6d6c
commit b35a05ad61
1 changed files with 32 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/m_cond.c
View file

@ -3441,16 +3441,31 @@ INT32 M_CountMedals(boolean all, boolean extraonly)
{ {
for (i = 0; i < numemblems; ++i) for (i = 0; i < numemblems; ++i)
{ {
// Not init in SOC
if (emblemlocations[i].type == ET_NONE) if (emblemlocations[i].type == ET_NONE)
continue; continue;
// Not explicitly a medal
if ((emblemlocations[i].type == ET_GLOBAL) if ((emblemlocations[i].type == ET_GLOBAL)
&& (emblemlocations[i].flags & GE_NOTMEDAL)) && (emblemlocations[i].flags & GE_NOTMEDAL))
continue; continue;
// Not getting the counter, and not collected
if (!all && !gamedata->collected[i]) if (!all && !gamedata->collected[i])
continue; continue;
// Don't count Platinums in the overall count, so you can get 101% going for them
if (all
&& (emblemlocations[i].type == ET_TIME)
&& (emblemlocations[i].tag == AUTOMEDAL_PLATINUM))
continue;
// Relevant, add to da counter
found++; found++;
} }
} }
// Above but for extramedals
for (i = 0; i < MAXUNLOCKABLES; ++i) for (i = 0; i < MAXUNLOCKABLES; ++i)
{ {
if (unlockables[i].type != SECRET_EXTRAMEDAL) if (unlockables[i].type != SECRET_EXTRAMEDAL)
@ -3459,6 +3474,7 @@ INT32 M_CountMedals(boolean all, boolean extraonly)
continue; continue;
found++; found++;
} }
return found; return found;
} }
@ -3473,14 +3489,28 @@ boolean M_GotEnoughMedals(INT32 number)
INT32 i, gottenmedals = 0; INT32 i, gottenmedals = 0;
for (i = 0; i < numemblems; ++i) for (i = 0; i < numemblems; ++i)
{ {
// Not init in SOC
if (emblemlocations[i].type == ET_NONE) if (emblemlocations[i].type == ET_NONE)
continue; continue;
// Not explicitly a medal
if ((emblemlocations[i].type == ET_GLOBAL)
&& (emblemlocations[i].flags & GE_NOTMEDAL))
continue;
// Not collected
if (!gamedata->collected[i]) if (!gamedata->collected[i])
continue; continue;
// Add to counter. Hit our threshold?
if (++gottenmedals < number) if (++gottenmedals < number)
continue; continue;
// We did!
return true; return true;
} }
// Above but for extramedals
for (i = 0; i < MAXUNLOCKABLES; ++i) for (i = 0; i < MAXUNLOCKABLES; ++i)
{ {
if (unlockables[i].type != SECRET_EXTRAMEDAL) if (unlockables[i].type != SECRET_EXTRAMEDAL)
@ -3491,6 +3521,8 @@ boolean M_GotEnoughMedals(INT32 number)
continue; continue;
return true; return true;
} }
// Didn't hit our counter!
return false; return false;
} }