mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2026-04-26 20:11:47 +00:00
Merge branch 'fix-rocket-bail' into 'master'
Really remove rocketsneaker while bailing See merge request kart-krew-dev/ring-racers-internal!2914
This commit is contained in:
commit
2d3e7ce049
2 changed files with 1 additions and 3 deletions
|
|
@ -54,9 +54,6 @@ void K_AddHitLag(mobj_t *mo, INT32 tics, boolean fromDamage)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (mo->player && mo->player->overshield)
|
|
||||||
tics = min(tics, 3);
|
|
||||||
|
|
||||||
mo->hitlag += tics;
|
mo->hitlag += tics;
|
||||||
mo->hitlag = min(mo->hitlag, MAXHITLAGTICS);
|
mo->hitlag = min(mo->hitlag, MAXHITLAGTICS);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -10867,6 +10867,7 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
|
||||||
|
|
||||||
player->itemamount = 0;
|
player->itemamount = 0;
|
||||||
player->itemtype = 0;
|
player->itemtype = 0;
|
||||||
|
player->rocketsneakertimer = 0;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
if (player->itemamount)
|
if (player->itemamount)
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue