mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2026-04-27 12:31:54 +00:00
Merge branch 'versus-hidden-rank' into 'master'
Make hidden rank system compatible with any gametype in the special stage slot. See merge request kart-krew-dev/ring-racers!31
This commit is contained in:
commit
1c8bf6987d
2 changed files with 2 additions and 3 deletions
|
|
@ -5939,7 +5939,7 @@ void G_SetRetryFlag(void)
|
||||||
{
|
{
|
||||||
if (retrying == false && grandprixinfo.gp)
|
if (retrying == false && grandprixinfo.gp)
|
||||||
{
|
{
|
||||||
if (!specialstageinfo.valid)
|
if (grandprixinfo.eventmode != GPEVENT_SPECIAL)
|
||||||
grandprixinfo.rank.continuesUsed++;
|
grandprixinfo.rank.continuesUsed++;
|
||||||
grandprixinfo.rank.levels[grandprixinfo.rank.numLevels].continues++;
|
grandprixinfo.rank.levels[grandprixinfo.rank.numLevels].continues++;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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.
|
// If our last map was Special, check for "uncredited" continues to offset the rank bump.
|
||||||
fixed_t hiddenpercent = percent;
|
fixed_t hiddenpercent = percent;
|
||||||
gpRank_level_t *lastgrade = &rankData->levels[rankData->numLevels - 1];
|
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;
|
hiddenpercent -= FRACUNIT / RANK_CONTINUE_PENALTY_DIV * lastgrade->continues;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue