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

Merge branch 'woops-cuprow' into 'master'

Browse source 
Woops cuprow

See merge request KartKrew/Kart!1656
This commit is contained in:
toaster 2023-11-22 15:53:35 +00:00
commit 33730d27da
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/m_cond.c
View file

@ -1302,6 +1302,10 @@ UINT16 M_CheckCupEmeralds(UINT8 difficulty)
for (cup = kartcupheaders; cup; cup = cup->next) for (cup = kartcupheaders; cup; cup = cup->next)
{ {
// Don't use custom material
if (cup->id >= basenumkartcupheaders)
break;
// Does it not *have* an emerald? // Does it not *have* an emerald?
if (cup->emeraldnum == 0 || cup->emeraldnum > 14) if (cup->emeraldnum == 0 || cup->emeraldnum > 14)
continue; continue;
@ -1390,22 +1394,25 @@ boolean M_CheckCondition(condition_t *cn, player_t *player)
case UC_ALLCUPRECORDS: case UC_ALLCUPRECORDS:
{ {
cupheader_t *cup;
UINT8 difficulty = cn->extrainfo2;
if (gamestate == GS_LEVEL) if (gamestate == GS_LEVEL)
return false; // this one could be laggy with many cups available return false; // this one could be laggy with many cups available
INT32 requiredid = cn->requirement;
if (requiredid == -1) // stop at all basegame cup
requiredid = basenumkartcupheaders;
UINT8 difficulty = cn->extrainfo2;
if (difficulty > KARTGP_MASTER) if (difficulty > KARTGP_MASTER)
difficulty = KARTGP_MASTER; difficulty = KARTGP_MASTER;
cupheader_t *cup;
for (cup = kartcupheaders; cup; cup = cup->next) for (cup = kartcupheaders; cup; cup = cup->next)
{ {
// Ok, achieved up to the desired cup. // Ok, achieved up to the desired cup.
if (cn->requirement == cup->id) if (cup->id == requiredid)
return true; return true;
cupwindata_t *windata = &cup->windata[cn->extrainfo2]; cupwindata_t *windata = &cup->windata[difficulty];
// Did you actually get it? // Did you actually get it?
if (windata->best_placement == 0) if (windata->best_placement == 0)
@ -1417,7 +1424,7 @@ boolean M_CheckCondition(condition_t *cn, player_t *player)
} }
// If we ended up here, check we were looking for all cups achieved. // If we ended up here, check we were looking for all cups achieved.
return (cn->requirement == -1); return (requiredid == basenumkartcupheaders);
} }