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

Duel uses internal 99 laps

Browse source
This commit is contained in:
Antonio Martinez 2025-05-24 17:35:51 -04:00
parent 28f12acab1
commit 0fc8077375
1 changed files with 9 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/k_kart.c
View file

@ -297,7 +297,7 @@ void K_TimerInit(void)
} }
if (K_InRaceDuel()) if (K_InRaceDuel())
numlaps = 1; numlaps = 99;
} }
} }
@ -9780,14 +9780,6 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
player->amppickup--; player->amppickup--;
} }
// ACHTUNG TEMPORARY FUCKUP.
// Disable skip protection in Race Duel because of distance jumps in infinite-lap contexts.
// This shouldn't exist at all in release 2.4, so this is probably fine, right...?
if (K_InRaceDuel())
{
player->pflags |= PF_TRUSTWAYPOINTS;
}
// Don't tick down while in damage state. // Don't tick down while in damage state.
// There may be some maps where the timer activates for // There may be some maps where the timer activates for
@ -11081,13 +11073,6 @@ static void K_UpdateDistanceFromFinishLine(player_t *const player)
} }
Z_Free(pathtofinish.array); Z_Free(pathtofinish.array);
if (K_InRaceDuel() && player->position == 1)
{
// As far as we're concerned, the race starts and ends with our position.
// Don't care about laps at all!
}
else
{
// distancetofinish is currently a flat distance to the finish line, but in order to be fully // distancetofinish is currently a flat distance to the finish line, but in order to be fully
// correct we need to add to it the length of the entire circuit multiplied by the number of laps // correct we need to add to it the length of the entire circuit multiplied by the number of laps
// left after this one. This will give us the total distance to the finish line, and allow item // left after this one. This will give us the total distance to the finish line, and allow item
@ -11096,18 +11081,12 @@ static void K_UpdateDistanceFromFinishLine(player_t *const player)
if ((mapheader->levelflags & LF_SECTIONRACE) == 0U) if ((mapheader->levelflags & LF_SECTIONRACE) == 0U)
{ {
UINT8 numfulllapsleft = ((UINT8)numlaps - player->laps) / mapheader->lapspersection; UINT8 numfulllapsleft = ((UINT8)numlaps - player->laps) / mapheader->lapspersection;
if (K_InRaceDuel())
{
player_t *opp = K_DuelOpponent(player);
numfulllapsleft = opp->laps - player->laps;
}
player->distancetofinish += numfulllapsleft * K_GetCircuitLength(); player->distancetofinish += numfulllapsleft * K_GetCircuitLength();
} }
} }
} }
} }
} }
}
static UINT32 u32_delta(UINT32 x, UINT32 y) static UINT32 u32_delta(UINT32 x, UINT32 y)
{ {