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 'reserve-bail' into 'master'

Browse source 
Fix multibail and reserve item bail

Closes #1608

See merge request kart-krew-dev/ring-racers-internal!2697
This commit is contained in:
Oni VelocitOni 2025-07-23 22:46:59 +00:00
commit 8f5b05fe8f
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/k_kart.c
View file

@ -8209,6 +8209,11 @@ void K_DropItems(player_t *player)
K_DropPaperItem(player, player->itemtype, player->itemamount); K_DropPaperItem(player, player->itemtype, player->itemamount);
} }
if (player->backupitemamount > 0)
{
K_DropPaperItem(player, player->backupitemtype, player->backupitemamount);
}
K_StripItems(player); K_StripItems(player);
} }
@ -12827,6 +12832,9 @@ void K_StripItems(player_t *player)
player->itemamount = 0; player->itemamount = 0;
player->itemflags &= ~(IF_ITEMOUT|IF_EGGMANOUT); player->itemflags &= ~(IF_ITEMOUT|IF_EGGMANOUT);
player->backupitemtype = KITEM_NONE;
player->backupitemamount = 0;
if (player->itemRoulette.eggman == false) if (player->itemRoulette.eggman == false)
{ {
K_StopRoulette(&player->itemRoulette); K_StopRoulette(&player->itemRoulette);
@ -14186,7 +14194,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
player->counterdash += TICRATE/8; player->counterdash += TICRATE/8;
player->ringboost += bailboost * (3+K_GetKartRingPower(player, true)); player->ringboost += bailboost * (3+K_GetKartRingPower(player, true));
player->baildrop = baildrop * BAIL_DROPFREQUENCY + 1; player->baildrop += baildrop * BAIL_DROPFREQUENCY + 1;
K_AddHitLag(player->mo, TICRATE/4, false); K_AddHitLag(player->mo, TICRATE/4, false);
player->bailquake = true; // set for a one time quake effect as soon as hitlag ends player->bailquake = true; // set for a one time quake effect as soon as hitlag ends