From f8f18ea12f280f8de33d840ca625e8ccf9778c2a Mon Sep 17 00:00:00 2001 From: Alug Date: Sun, 10 Aug 2025 19:04:42 +0200 Subject: [PATCH] check if minimaphead exists hopefully fixes a random crash there --- src/k_hud.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/k_hud.c b/src/k_hud.c index 68f4f395d..346e7641c 100644 --- a/src/k_hud.c +++ b/src/k_hud.c @@ -3508,7 +3508,7 @@ static void K_drawKartMinimapIcon(fixed_t objx, fixed_t objy, INT32 hudx, INT32 fixed_t amnumxpos, amnumypos; INT32 amxpos, amypos; fixed_t scale = FRACUNIT; - patch_t *AutomapPic; + patch_t *AutomapPic = NULL; INT16 w, h; AutomapPic = minimapinfo.minimap_pic; @@ -3565,7 +3565,6 @@ static void K_drawKartMinimapHead(mobj_t *mo, INT32 x, INT32 y, INT32 flags) INT32 amxpos, amypos, wntdamxpos, wntdamypos; fixed_t scale = FRACUNIT; patch_t *minimaphead = NULL; - boolean minihead = K_useSmallMinimapHead(mo->player); #ifdef ROTSPRITE angle_t rollangle = 0; @@ -3575,6 +3574,9 @@ static void K_drawKartMinimapHead(mobj_t *mo, INT32 x, INT32 y, INT32 flags) skin = K_GetMobjSkin(mo); minimaphead = (skinlocal ? localfacemmapprefix : facemmapprefix)[K_GetMobjSkinNum(skin, skinlocal)]; + if (minimaphead == NULL) + return; + amnumxpos = (FixedMul(lerp(mo->old_x, mo->x), minimapinfo.zoom) - minimapinfo.offs_x); amnumypos = -(FixedMul(lerp(mo->old_y, mo->y), minimapinfo.zoom) - minimapinfo.offs_y); @@ -3589,6 +3591,7 @@ static void K_drawKartMinimapHead(mobj_t *mo, INT32 x, INT32 y, INT32 flags) V_DrawCenteredSmallStringAtFixed(amxpos + (4*FRACUNIT), amypos - (3*FRACUNIT), V_ALLOWLOWERCASE|flags|V_SkinColorToHighlightcolor(mo->color), player_names[player - players]); } + const boolean minihead = K_useSmallMinimapHead(mo->player); // thx wanted reticle for having weird offsets very cool wntdamxpos = minihead ? amxpos + (1<