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 'no-neostart-in-duel' into 'master'

Browse source 
Whoops, use the right boost type (and not in Duel)

See merge request kart-krew-dev/ring-racers-internal!2930
This commit is contained in:
AJ Martinez 2025-10-11 07:38:58 +00:00
commit 6cd9746c4b
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/k_kart.c
View file

@ -10210,7 +10210,7 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
UINT16 maxduration = 125; UINT16 maxduration = 125;
UINT16 duration = FixedRescale(leveltime - starttime, 0, TICRATE*2, Easing_Linear, maxduration, 0); UINT16 duration = FixedRescale(leveltime - starttime, 0, TICRATE*2, Easing_Linear, maxduration, 0);
player->aciddropdashboost += duration; player->neostartboost += duration;
S_StartSound(player->mo, sfx_s23c); S_StartSound(player->mo, sfx_s23c);
if (duration) if (duration)

2
src/p_spec.c
View file

@ -2074,7 +2074,7 @@ static void K_HandleLapIncrement(player_t *player)
// CONS_Printf("%d: %s gimme first blood\n", leveltime, player_names[player - players]); // CONS_Printf("%d: %s gimme first blood\n", leveltime, player_names[player - players]);
player->pflags2 |= PF2_GIMMEFIRSTBLOOD; player->pflags2 |= PF2_GIMMEFIRSTBLOOD;
} }
else else if (!K_InRaceDuel())
{ {
// CONS_Printf("%d: %s gimme start award\n", leveltime, player_names[player - players]); // CONS_Printf("%d: %s gimme start award\n", leveltime, player_names[player - players]);
player->pflags2 |= PF2_GIMMESTARTAWARDS; player->pflags2 |= PF2_GIMMESTARTAWARDS;