From 9a45acdd7d88d24fc72267dae431e768d9e67cef Mon Sep 17 00:00:00 2001 From: NepDisk Date: Tue, 13 May 2025 13:53:46 -0400 Subject: [PATCH] Fix item rolls --- src/k_kart.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index 465e3676a..2789a4577 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -744,8 +744,8 @@ INT32 K_KartGetItemOdds( if (players[i].exiting) pexiting++; - if ((shieldtype == K_GetShieldFromItem(players[i].itemtype)) - || (shieldtype == K_GetShieldFromPlayer(&players[i]))) + if (shieldtype != KSHIELD_NONE && ((shieldtype == K_GetShieldFromItem(players[i].itemtype)) + || (shieldtype == K_GetShieldFromPlayer(&players[i])))) { // Don't allow more than one of each shield type at a time return 0; @@ -957,8 +957,8 @@ INT32 K_KartGetLegacyItemOdds(UINT8 pos, SINT8 item, fixed_t mashed, boolean spb if (players[i].exiting) pexiting++; - if ((shieldtype == K_GetShieldFromItem(players[i].itemtype)) - || (shieldtype == K_GetShieldFromPlayer(&players[i]))) + if (shieldtype != KSHIELD_NONE && ((shieldtype == K_GetShieldFromItem(players[i].itemtype)) + || (shieldtype == K_GetShieldFromPlayer(&players[i])))) { // Don't allow more than one of each shield type at a time return 0;