incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Kill voidptrs

Browse source
This commit is contained in:
Anonimus 2025-11-07 06:20:40 -05:00
parent 21dcf384fb
commit 540978570a
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/k_items.c
View file

@ -960,7 +960,7 @@ INT32 K_KartGetItemOdds(
// This item has unique odds!
//CONS_Printf("Unique odds found. Assigning uoddsfunc...");
uoddsfunc = (useoddsfunc_t)result->unique_odds[oddstable][result->format];
uoddsfunc = result->unique_odds[oddstable][result->format];
//CONS_Printf("Running...");
newodds = uoddsfunc(result, playerpos, pdis, newodds, pos, pingame, pexiting, firstDist, ourDist, clusterDist, mashed, spbrush, bot, rival, inBottom);

4
src/k_items.h
View file

@ -120,7 +120,7 @@ enum
// Unique useodds function:
// uoddsfunc(result, playerpos, pdis, newodds, pos, pingame, pexiting, firstDist, ourDist, clusterDist, mashed, spbrush, bot, rival, inBottom)
// FIXME: This is fucking gross; is there not a better way to do this?
typedef INT32(*useoddsfunc_t)(void *, SINT8, UINT32, INT32, UINT8, UINT8, UINT8, UINT32, UINT32, UINT32, fixed_t, boolean, boolean, boolean, boolean);
typedef INT32(*useoddsfunc_t)(kartresult_t *, SINT8, UINT32, INT32, UINT8, UINT8, UINT8, UINT32, UINT32, UINT32, fixed_t, boolean, boolean, boolean, boolean);
struct kartresult_t
{
@ -138,7 +138,7 @@ struct kartresult_t
// Functions that tell the game to use unique means of rolling these items.
// If NULL, the functions never execute.
void *unique_odds[MAXODDSTABLES][NUMKARTITEMFORMATS];
useoddsfunc_t unique_odds[MAXODDSTABLES][NUMKARTITEMFORMATS];
UINT8 flags[NUMKARTITEMFORMATS];
tic_t basebgone, bgone;