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 '99-laps' into 'master'

Browse source 
Duels end at 99 laps, high lapcount HUD safety

Closes ring-racers#107

See merge request kart-krew-dev/ring-racers-internal!2892
This commit is contained in:
AJ Martinez 2025-09-26 17:57:29 +00:00
commit d55eab9748
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/k_hud.cpp
View file

@ -7166,11 +7166,13 @@ static void K_drawLapStartAnim(void)
oldval = (188 + (32 * std::max(0, progressOld - 76))) * FRACUNIT;
interpx = R_InterpolateFixed(oldval, newval);
UINT32 sanitizedlaps = std::min((UINT32)99, (UINT32)stplyr->latestlap);
V_DrawFixedPatch(
interpx, // 194
30*FRACUNIT, // 24
FRACUNIT, V_SNAPTOTOP|hudtransflags,
kp_lapanim_number[(((UINT32)stplyr->latestlap) / 10)][std::min(progress/2-8, 2)], NULL);
kp_lapanim_number[(sanitizedlaps / 10)][std::min(progress/2-8, 2)], NULL);
if (progress/2-10 >= 0)
{
@ -7182,7 +7184,7 @@ static void K_drawLapStartAnim(void)
interpx, // 221
30*FRACUNIT, // 24
FRACUNIT, V_SNAPTOTOP|hudtransflags,
kp_lapanim_number[(((UINT32)stplyr->latestlap) % 10)][std::min(progress/2-10, 2)], NULL);
kp_lapanim_number[(sanitizedlaps % 10)][std::min(progress/2-10, 2)], NULL);
}
}
}

2
src/p_spec.c
View file

@ -2020,7 +2020,7 @@ static void K_HandleLapIncrement(player_t *player)
}
// finished race exit setup
if (player->laps > numlaps && !K_InRaceDuel())
if (player->laps > numlaps)
{
pflags_t applyflags = 0;
if (specialstageinfo.valid == true)