mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2026-04-27 12:31:54 +00:00
Merge branch 'no-neostart-in-duel' into 'master'
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:
commit
6cd9746c4b
2 changed files with 2 additions and 2 deletions
|
|
@ -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)
|
||||||
|
|
|
||||||
|
|
@ -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;
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue