mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2026-04-27 12:31:54 +00:00
Fix empty item roulettes
This commit is contained in:
parent
719ba464af
commit
5df0a31363
1 changed files with 15 additions and 0 deletions
|
|
@ -1232,6 +1232,17 @@ static boolean K_TimingPermitsItem(kartitems_t item, const itemroulette_t *roule
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void K_FixEmptyRoulette(const player_t *player, itemroulette_t *const roulette)
|
||||||
|
{
|
||||||
|
if (roulette->itemListLen > 0)
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (K_PlayerUsesBotMovement(player)) // Bots can't use certain items. Give them _something_.
|
||||||
|
K_PushToRouletteItemList(roulette, KITEM_SUPERRING);
|
||||||
|
else // Players can use all items, so this should never happen.
|
||||||
|
K_PushToRouletteItemList(roulette, KITEM_SAD);
|
||||||
|
}
|
||||||
|
|
||||||
/*--------------------------------------------------
|
/*--------------------------------------------------
|
||||||
void K_FillItemRouletteData(const player_t *player, itemroulette_t *const roulette, boolean ringbox, boolean dryrun)
|
void K_FillItemRouletteData(const player_t *player, itemroulette_t *const roulette, boolean ringbox, boolean dryrun)
|
||||||
|
|
||||||
|
|
@ -1376,6 +1387,7 @@ void K_FillItemRouletteData(const player_t *player, itemroulette_t *const roulet
|
||||||
if (K_ForcedSPB(player, roulette) == true)
|
if (K_ForcedSPB(player, roulette) == true)
|
||||||
{
|
{
|
||||||
K_AddItemToReel(player, roulette, KITEM_SPB);
|
K_AddItemToReel(player, roulette, KITEM_SPB);
|
||||||
|
K_FixEmptyRoulette(player, roulette);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1400,6 +1412,7 @@ void K_FillItemRouletteData(const player_t *player, itemroulette_t *const roulet
|
||||||
// singleItem = KITEM_SAD by default,
|
// singleItem = KITEM_SAD by default,
|
||||||
// so it will be used when all items are turned off.
|
// so it will be used when all items are turned off.
|
||||||
K_AddItemToReel(player, roulette, singleItem);
|
K_AddItemToReel(player, roulette, singleItem);
|
||||||
|
K_FixEmptyRoulette(player, roulette);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1755,6 +1768,8 @@ void K_FillItemRouletteData(const player_t *player, itemroulette_t *const roulet
|
||||||
|
|
||||||
totalSpawnChance--;
|
totalSpawnChance--;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
K_FixEmptyRoulette(player, roulette);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*--------------------------------------------------
|
/*--------------------------------------------------
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue