Fix item rolls
This commit is contained in:
parent
18c17b6b7c
commit
9a45acdd7d
1 changed files with 4 additions and 4 deletions
|
|
@ -744,8 +744,8 @@ INT32 K_KartGetItemOdds(
|
||||||
if (players[i].exiting)
|
if (players[i].exiting)
|
||||||
pexiting++;
|
pexiting++;
|
||||||
|
|
||||||
if ((shieldtype == K_GetShieldFromItem(players[i].itemtype))
|
if (shieldtype != KSHIELD_NONE && ((shieldtype == K_GetShieldFromItem(players[i].itemtype))
|
||||||
|| (shieldtype == K_GetShieldFromPlayer(&players[i])))
|
|| (shieldtype == K_GetShieldFromPlayer(&players[i]))))
|
||||||
{
|
{
|
||||||
// Don't allow more than one of each shield type at a time
|
// Don't allow more than one of each shield type at a time
|
||||||
return 0;
|
return 0;
|
||||||
|
|
@ -957,8 +957,8 @@ INT32 K_KartGetLegacyItemOdds(UINT8 pos, SINT8 item, fixed_t mashed, boolean spb
|
||||||
if (players[i].exiting)
|
if (players[i].exiting)
|
||||||
pexiting++;
|
pexiting++;
|
||||||
|
|
||||||
if ((shieldtype == K_GetShieldFromItem(players[i].itemtype))
|
if (shieldtype != KSHIELD_NONE && ((shieldtype == K_GetShieldFromItem(players[i].itemtype))
|
||||||
|| (shieldtype == K_GetShieldFromPlayer(&players[i])))
|
|| (shieldtype == K_GetShieldFromPlayer(&players[i]))))
|
||||||
{
|
{
|
||||||
// Don't allow more than one of each shield type at a time
|
// Don't allow more than one of each shield type at a time
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue