thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

K_GetRollingRouletteItem: support Battle

Browse source
This commit is contained in:
James R 2022-09-23 04:29:40 -07:00
parent 375fb72de1
commit 3d01fca41b
1 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/k_kart.c
View file

@ -904,27 +904,44 @@ INT32 K_GetRollingRouletteItem(player_t *player)
static UINT8 translation[NUMKARTITEMS-1]; static UINT8 translation[NUMKARTITEMS-1];
static UINT16 roulette_size; static UINT16 roulette_size;
static boolean odds_uncached = true; static INT16 odds_cached = -1;
// Race odds have more columns than Battle
const UINT8 EMPTYODDS[sizeof K_KartItemOddsRace[0]] = {0}; const UINT8 EMPTYODDS[sizeof K_KartItemOddsRace[0]] = {0};
if (odds_uncached) if (odds_cached != gametype)
{ {
UINT8 *odds_row;
size_t odds_row_size;
UINT8 i; UINT8 i;
roulette_size = 0; roulette_size = 0;
if (gametype == GT_BATTLE)
{
odds_row = K_KartItemOddsBattle[0];
odds_row_size = sizeof K_KartItemOddsBattle[0];
}
else
{
odds_row = K_KartItemOddsRace[0];
odds_row_size = sizeof K_KartItemOddsRace[0];
}
for (i = 1; i < NUMKARTITEMS; ++i) for (i = 1; i < NUMKARTITEMS; ++i)
{ {
if (memcmp(K_KartItemOddsRace[i - 1], EMPTYODDS, sizeof EMPTYODDS)) if (memcmp(odds_row, EMPTYODDS, odds_row_size))
{ {
translation[roulette_size] = i; translation[roulette_size] = i;
roulette_size++; roulette_size++;
} }
odds_row += odds_row_size;
} }
roulette_size *= 3; roulette_size *= 3;
odds_uncached = false; odds_cached = gametype;
} }
return translation[(player->itemroulette % roulette_size) / 3]; return translation[(player->itemroulette % roulette_size) / 3];