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

Init roulette before prehook can bail, IDIOT

Browse source
This commit is contained in:
Antonio Martinez 2025-07-10 04:48:19 -04:00
parent 4ed4989f3b
commit 23912a7c63
1 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/k_roulette.c
View file

@ -1164,18 +1164,39 @@ static boolean K_TimingPermitsItem(kartitems_t item, const itemroulette_t *roule
void K_FillItemRoulette(player_t *const player, itemroulette_t *const roulette, boolean ringbox)
{
K_InitRoulette(roulette);
if (player != NULL)
{
roulette->baseDist = K_UndoMapScaling(player->distancetofinish);
if (player->pflags & PF_AUTOROULETTE)
roulette->autoroulette = true;
K_CalculateRouletteSpeed(roulette);
}
CONS_Printf("HC: prehook\n");
// Lua may want to intercept reelbuilder entirely.
LUA_HookPreFillItemRoulette(player, roulette);
CONS_Printf("HC: bail\n");
// If prehook did something, no need to continue.
if (roulette->itemList.len != 0) {
return;
}
CONS_Printf("HC: fill\n");
K_FillItemRouletteData(player, roulette, ringbox, false);
CONS_Printf("HC: posthook\n");
// Lua can modify the final result.
LUA_HookFillItemRoulette(player, roulette);
CONS_Printf("HC: out\n");
// If somehow there's no items, add sad.
if (roulette->itemList.len == 0) {
@ -1198,18 +1219,6 @@ void K_FillItemRouletteData(player_t *player, itemroulette_t *const roulette, bo
kartitems_t singleItem = KITEM_SAD;
size_t i, j;
K_InitRoulette(roulette);
if (player != NULL)
{
roulette->baseDist = K_UndoMapScaling(player->distancetofinish);
if (player->pflags & PF_AUTOROULETTE)
roulette->autoroulette = true;
K_CalculateRouletteSpeed(roulette);
}
if (ringbox == true)
{