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

Internal merge lua roulette fixup hell

Browse source
This commit is contained in:
Antonio Martinez 2025-07-04 15:43:16 -04:00
parent 44d5848918
commit 4694430292
3 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/k_roulette.h
View file

@ -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);
/*--------------------------------------------------

3
src/lua_baselib.c
View file

@ -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;
}

8
src/lua_itemroulettelib.c
View file

@ -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;