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

Clean up and make safe some hudcode

Browse source 
* Un-shadowed the two hudtrans variables
* Zero-initialized the trackingResult_t in K_getRoulettePositionForTrackingPlayer
* Zero-initialized the drawinfo_t and rouletteinfo_t in libd_getDrawInfo
* Removed really gross trailing whitespaces from ported RadioRacers code
This commit is contained in:
yamamama 2026-02-04 10:33:43 -05:00
parent 80898a0607
commit d880abe8ea
2 changed files with 8 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/k_hud.c
View file

@ -1055,7 +1055,7 @@ static void K_initKartHUD(void)
// RadioRacers
static trackingResult_t K_getRoulettePositionForTrackingPlayer(void)
{
trackingResult_t result;
trackingResult_t result = {0};
// No player object? Not bothering.
const boolean doesPlayerHaveMo = !((stplyr->mo == NULL || P_MobjWasRemoved(stplyr->mo)));
@ -1069,13 +1069,13 @@ static trackingResult_t K_getRoulettePositionForTrackingPlayer(void)
};
vector3_t v2 = {
0,
0,
0,
0,
64 * stplyr->mo->scale * P_MobjFlip(stplyr->mo)
};
FV3_Add(&v,&v2);
K_ObjectTracking(&result, &v, false);
return result;
@ -1590,7 +1590,7 @@ static void K_drawKartItem(void)
{
fixed_t rfy = fy<<FRACBITS;
INT32 fancyflags = V_HUDTRANS|fflags;
INT32 hudtrans = cv_translucenthud.value;
INT32 cvarhudtrans = cv_translucenthud.value;
INT32 animlength = cv_fancyroulettespeed.value;
INT32 alpha = 0;
INT32 shift = tiny ? 16 : 32;
@ -1610,7 +1610,7 @@ static void K_drawKartItem(void)
for (int rouletteshift = -1; rouletteshift <= 2; rouletteshift++)
{
shiftprog = (FRACUNIT * -rouletteshift) + (FixedDiv((stplyr->itemroulette<<FRACBITS)|timefracs, animlength<<FRACBITS) % FRACUNIT);
alpha = (FixedMul((abs(shiftprog) * 10), FixedDiv(hudtrans << FRACBITS, 10 << FRACBITS)) >> FRACBITS)+(10-hudtrans);
alpha = (FixedMul((abs(shiftprog) * 10), FixedDiv(cvarhudtrans << FRACBITS, 10 << FRACBITS)) >> FRACBITS)+(10-cvarhudtrans);
rfy = (fy<<FRACBITS) + FixedMul(shift*shiftprog, info.hudScale);
if (0 > alpha) alpha = 0;
if (alpha >= 10) alpha = 10;

15
src/lua_hudlib.c
View file

@ -1504,19 +1504,8 @@ static int libd_getDrawInfo(lua_State *L)
{
HUDONLY
enum huddrawinfo option = luaL_checkoption(L, 1, NULL, hud_drawinfo_options);
drawinfo_t info;
rouletteinfo_t rinfo;
// Initialize the extra values that might not get used.
info.hudScale = 0;
info.hudScaleFloat = 0.0f;
rinfo.crop.x = 0;
rinfo.crop.y = 0;
rinfo.flags = 0;
rinfo.offset = 0;
rinfo.spacing = 0;
rinfo.intSpacing = 0;
drawinfo_t info = {0};
rouletteinfo_t rinfo = {0};
switch(option) {
case huddrawinfo_item: K_getItemBoxDrawinfo(&info, &rinfo);break;