Merge branch 'fix-snatch-deployed-edgecase' into 'master'

Don't move backup item into main slot if player has item deployed

See merge request kart-krew-dev/ring-racers!59
This commit is contained in:
Eidolon 2025-10-15 21:39:10 -05:00
commit 15413bf6d0

View file

@ -9171,7 +9171,7 @@ static void K_MoveHeldObjects(player_t *player)
// If we can move our backup item into main slots, do so.
static void K_TryMoveBackupItem(player_t *player)
{
if (player->itemtype && player->itemtype == player->backupitemtype)
if (player->itemtype && player->itemtype == player->backupitemtype && !(player->itemflags & IF_ITEMOUT))
{
player->itemamount += player->backupitemamount;