Merge remote-tracking branch 'public/master'

This commit is contained in:
Eidolon 2025-10-12 12:26:11 -05:00
commit 4d5099070b
2 changed files with 2 additions and 3 deletions

View file

@ -5939,7 +5939,7 @@ void G_SetRetryFlag(void)
{
if (retrying == false && grandprixinfo.gp)
{
if (!specialstageinfo.valid)
if (grandprixinfo.eventmode != GPEVENT_SPECIAL)
grandprixinfo.rank.continuesUsed++;
grandprixinfo.rank.levels[grandprixinfo.rank.numLevels].continues++;
}

View file

@ -577,9 +577,8 @@ gp_rank_e K_CalculateGPGrade(gpRank_t *rankData)
// If our last map was Special, check for "uncredited" continues to offset the rank bump.
fixed_t hiddenpercent = percent;
gpRank_level_t *lastgrade = &rankData->levels[rankData->numLevels - 1];
UINT32 id = lastgrade->id;
if (rankData->specialWon && (mapheaderinfo[id-1]->typeoflevel & G_TOLFlag(GT_SPECIAL)))
if (rankData->specialWon)
{
hiddenpercent -= FRACUNIT / RANK_CONTINUE_PENALTY_DIV * lastgrade->continues;
}