From f32eefb9b5cf0445ab1a84a512ba2e75be046cfa Mon Sep 17 00:00:00 2001 From: Antonio Martinez Date: Fri, 4 Jul 2025 15:48:10 -0400 Subject: [PATCH] Internal fuckup the third --- src/k_roulette.h | 32 -------------------------------- src/lua_baselib.c | 9 ++++----- 2 files changed, 4 insertions(+), 37 deletions(-) diff --git a/src/k_roulette.h b/src/k_roulette.h index 3d356f75a..79d954c55 100644 --- a/src/k_roulette.h +++ b/src/k_roulette.h @@ -260,22 +260,6 @@ fixed_t K_GetSlotOffset(itemroulette_t *const roulette, fixed_t renderDelta, UIN void K_KartItemRoulette(player_t *const player, ticcmd_t *cmd); -/*-------------------------------------------------- - void K_CreateAndShuffleItemReel(player_t *const player, itemroulette_t *const roulette, const boolean freeplay); - - Adds items to the item reel based on the RNG seed, - item odds or whether it's free play or not. - - Input Arguments:- - player - The player to add items to their reel to. - roulette - The player's roulette. - freeplay - Whether we should create the free play - roulette instead or not. - - Return:- - N/A ---------------------------------------------------*/ - void K_KartGetItemResult(player_t *const player, kartitems_t getitem); /*-------------------------------------------------- @@ -294,22 +278,6 @@ void K_KartGetItemResult(player_t *const player, kartitems_t getitem); UINT32 K_GetItemRouletteDistance(const player_t *player, UINT8 numPlayers); -/*-------------------------------------------------- - static UINT8 K_FindUseodds(const player_t *player, itemroulette_t *const roulette) - - Gets which item bracket the player is in. - This can be adjusted depending on which - items being turned off. - - Input Arguments:- - player - The player the roulette is for. - roulette - The item roulette data. - - Return:- - The item bracket the player is in, as an - index to the array. ---------------------------------------------------*/ - #ifdef __cplusplus } // extern "C" #endif diff --git a/src/lua_baselib.c b/src/lua_baselib.c index 6ca5fa891..894fd3649 100644 --- a/src/lua_baselib.c +++ b/src/lua_baselib.c @@ -4333,20 +4333,20 @@ static int lib_kGetItemRouletteDistance(lua_State *L) return 1; } -static int lib_kCreateAndShuffleItemReel(lua_State *L) +static int lib_kFillItemRouletteData(lua_State *L) { player_t *player = NULL; itemroulette_t *itemRoulette = NULL; getItemRouletteOrPlayerBasedOnFirstParam(L, &player, &itemRoulette); - boolean freeplay = lua_optboolean(L, 2); + boolean ringbox = lua_optboolean(L, 2); NOHUD INLEVEL if (!player && !itemRoulette) return LUA_ErrInvalid(L, "player_t/itemroulette_t"); - K_CreateAndShuffleItemReel(player, itemRoulette, freeplay); + K_FillItemRouletteData(player, itemRoulette, ringbox, false); return 0; } @@ -4653,8 +4653,7 @@ static luaL_Reg lib[] = { {"K_StopRoulette", lib_kStopRoulette}, {"K_KartGetItemResult", lib_kKartGetItemResult}, {"K_GetItemRouletteDistance", lib_kGetItemRouletteDistance}, - {"K_FindUseodds", lib_kFindUseodds}, - {"K_CreateAndShuffleItemReel", lib_kCreateAndShuffleItemReel}, + {"K_FillItemRouletteData", lib_kFillItemRouletteData}, // hu_stuff technically? {"HU_DoTitlecardCEcho", lib_startTitlecardCecho},