Merge branch 'fix-eggmark-burst' into 'master'

Fix eggmark bail occuring when last roulette was eggmark

Closes ring-racers#379 and ring-racers#384

See merge request kart-krew-dev/ring-racers-internal!2968
This commit is contained in:
Oni VelocitOni 2025-10-24 04:11:58 +00:00
commit 121ac80b43

View file

@ -11043,7 +11043,7 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
mobj_t *bail = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z + player->mo->height/2, MT_BAIL);
P_SetTarget(&bail->target, player->mo);
if (player->itemRoulette.eggman || player->eggmanexplode)
if ((player->itemRoulette.active && player->itemRoulette.eggman) || player->eggmanexplode > 0)
{
player->markedfordeath = true;
player->eggmanexplode = 1;