Merge branch 'fix-bail-eggexplode2' into 'master'

Fix broken state after bailing with eggmark sometimes

See merge request kart-krew-dev/ring-racers-internal!2991
This commit is contained in:
Gunla 2025-11-01 19:20:37 +00:00
commit d5785bc12a

View file

@ -11060,7 +11060,6 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
if ((player->itemRoulette.active && player->itemRoulette.eggman) || player->eggmanexplode > 0) if ((player->itemRoulette.active && player->itemRoulette.eggman) || player->eggmanexplode > 0)
{ {
player->markedfordeath = true;
player->eggmanexplode = 1; player->eggmanexplode = 1;
player->rings = -20; player->rings = -20;
} }
@ -11087,7 +11086,7 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
*/ */
K_AddHitLag(player->mo, TICRATE/4, false); K_AddHitLag(player->mo, TICRATE/4, false);
player->bailhitlag = true; // set for a one time quake effect as soon as hitlag ends player->bailhitlag = true; // set to trigger the rest of the effect after hitlag
if (P_PlayerInPain(player)) if (P_PlayerInPain(player))
{ {