thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-26 20:11:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Internal fuckup the third

Browse source
This commit is contained in:
Antonio Martinez 2025-07-04 15:48:10 -04:00
parent 5a62e902a0
commit f32eefb9b5
2 changed files with 4 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/k_roulette.h
View file

@ -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_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); 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); 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 #ifdef __cplusplus
} // extern "C" } // extern "C"
#endif #endif

9
src/lua_baselib.c
View file

@ -4333,20 +4333,20 @@ static int lib_kGetItemRouletteDistance(lua_State *L)
return 1; return 1;
} }
static int lib_kCreateAndShuffleItemReel(lua_State *L) static int lib_kFillItemRouletteData(lua_State *L)
{ {
player_t *player = NULL; player_t *player = NULL;
itemroulette_t *itemRoulette = NULL; itemroulette_t *itemRoulette = NULL;
getItemRouletteOrPlayerBasedOnFirstParam(L, &player, &itemRoulette); getItemRouletteOrPlayerBasedOnFirstParam(L, &player, &itemRoulette);
boolean freeplay = lua_optboolean(L, 2); boolean ringbox = lua_optboolean(L, 2);
NOHUD NOHUD
INLEVEL INLEVEL
if (!player && !itemRoulette) if (!player && !itemRoulette)
return LUA_ErrInvalid(L, "player_t/itemroulette_t"); return LUA_ErrInvalid(L, "player_t/itemroulette_t");
K_CreateAndShuffleItemReel(player, itemRoulette, freeplay); K_FillItemRouletteData(player, itemRoulette, ringbox, false);
return 0; return 0;
} }
@ -4653,8 +4653,7 @@ static luaL_Reg lib[] = {
{"K_StopRoulette", lib_kStopRoulette}, {"K_StopRoulette", lib_kStopRoulette},
{"K_KartGetItemResult", lib_kKartGetItemResult}, {"K_KartGetItemResult", lib_kKartGetItemResult},
{"K_GetItemRouletteDistance", lib_kGetItemRouletteDistance}, {"K_GetItemRouletteDistance", lib_kGetItemRouletteDistance},
{"K_FindUseodds", lib_kFindUseodds}, {"K_FillItemRouletteData", lib_kFillItemRouletteData},
{"K_CreateAndShuffleItemReel", lib_kCreateAndShuffleItemReel},
// hu_stuff technically? // hu_stuff technically?
{"HU_DoTitlecardCEcho", lib_startTitlecardCecho}, {"HU_DoTitlecardCEcho", lib_startTitlecardCecho},