diff --git a/src/k_roulette.h b/src/k_roulette.h index 22c1bf273..7af1b98d8 100644 --- a/src/k_roulette.h +++ b/src/k_roulette.h @@ -134,7 +134,7 @@ INT32 K_KartGetBattleOdds(const player_t *player, UINT8 pos, kartitems_t item); /*-------------------------------------------------- - void K_FillItemRouletteData(const player_t *player, itemroulette_t *const roulette, boolean ringbox, boolean dryrun); + void K_FillItemRouletteData(player_t *player, itemroulette_t *const roulette, boolean ringbox, boolean dryrun); Fills out the item roulette struct when it is initially created. This function needs to be @@ -152,7 +152,7 @@ INT32 K_KartGetBattleOdds(const player_t *player, UINT8 pos, kartitems_t item); N/A --------------------------------------------------*/ -void K_FillItemRouletteData(const player_t *player, itemroulette_t *const roulette, boolean ringbox, boolean dryrun); +void K_FillItemRouletteData(player_t *player, itemroulette_t *const roulette, boolean ringbox, boolean dryrun); /*-------------------------------------------------- diff --git a/src/lua_baselib.c b/src/lua_baselib.c index 8ec941871..911edcc7d 100644 --- a/src/lua_baselib.c +++ b/src/lua_baselib.c @@ -3942,8 +3942,9 @@ static int lib_kItemResultToType(lua_State *L) static int lib_kItemResultToAmount(lua_State *L) { kartitems_t item = luaL_checkinteger(L, 1); + itemroulette_t *roulette = *((itemroulette_t **)luaL_checkudata(L, 2, META_ITEMROULETTE)); //HUDSAFE - lua_pushinteger(L, K_ItemResultToAmount(item)); + lua_pushinteger(L, K_ItemResultToAmount(item, roulette)); return 1; } diff --git a/src/lua_itemroulettelib.c b/src/lua_itemroulettelib.c index fa7b5e251..99da76fc3 100644 --- a/src/lua_itemroulettelib.c +++ b/src/lua_itemroulettelib.c @@ -26,7 +26,6 @@ enum itemroulette { itemroulette_valid = 0, itemroulette_active, itemroulette_itemlist, - itemroulette_useodds, itemroulette_playing, itemroulette_exiting, itemroulette_dist, @@ -48,7 +47,6 @@ static const char *const itemroulette_opt[] = { "valid", "active", "itemlist", - "useodds", "playing", "exiting", "dist", @@ -87,9 +85,6 @@ static int itemroulette_get(lua_State *L) case itemroulette_itemlist: LUA_PushUserdata(L, &itemroulette->itemList, META_ITEMROULETTE_ITEMLIST); break; - case itemroulette_useodds: - lua_pushinteger(L, itemroulette->useOdds); - break; case itemroulette_playing: lua_pushinteger(L, itemroulette->playing); break; @@ -171,9 +166,6 @@ static int itemroulette_set(lua_State *L) break; case itemroulette_itemlist: return NOSETITEMLIST; - case itemroulette_useodds: - itemroulette->useOdds = luaL_checkinteger(L, 3); - break; case itemroulette_playing: itemroulette->playing = luaL_checkinteger(L, 3); break;