skinlocal deez nuts

This commit is contained in:
Alug committed 2025-05-04 01:35:35 +02:00
1 parent b1c94a0885
commit 12ec3d11a2
2 files changed
+5 -11

No files matched your search

+2 -3
View File
@@ -10977,7 +10977,6 @@ static void K_drawKartMinimapHead(mobj_t *mo, INT32 x, INT32 y, INT32 flags)
const skin_t *skin;
player_t *player = mo->player;
const boolean skinlocal = mo->skinlocal;
fixed_t amnumxpos, amnumypos;
INT32 amxpos, amypos, wntdamxpos, wntdamypos;
@@ -10990,7 +10989,7 @@ static void K_drawKartMinimapHead(mobj_t *mo, INT32 x, INT32 y, INT32 flags)
#endif
skin = K_GetMobjSkin(mo);
minimaphead = (skinlocal ? localfacemmapprefix : facemmapprefix)[K_GetMobjSkinNum(skin, skinlocal)];
minimaphead = R_GetSkinFaceMini(player);
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);
@@ -11040,7 +11039,7 @@ static void K_drawKartMinimapHead(mobj_t *mo, INT32 x, INT32 y, INT32 flags)
if (mo->colorized)
colormap = R_GetTranslationColormap(TC_RAINBOW, mo->color, GTC_CACHE);
else
colormap = R_GetLocalTranslationColormap(mo->skin, mo->localskin, mo->color, GTC_CACHE, skinlocal);
colormap = R_GetLocalTranslationColormap(mo->skin, mo->localskin, mo->color, GTC_CACHE, mo->skinlocal);
V_DrawFixedPatch(amxpos, amypos, scale, flags, minimaphead, colormap);
+3 -8
View File
@@ -3865,10 +3865,7 @@ void A_SignPlayer(void *thing)
if (LUA_CallAction(A_SIGNPLAYER, actor))
return;
if (!actor->target)
return;
if (!actor->target->player)
if (!actor->target || !actor->target->player)
return;
// Set the sign to be an appropriate background color for this player's skincolor.
@@ -3883,11 +3880,9 @@ void A_SignPlayer(void *thing)
// needs - 1 or else it pukes an error out
// same thing happens on p_mobj.c
if (actor->target->skinlocal)
ov->localskin = &localskins[actor->target->player->localskin - 1];
else if (actor->target->player->localskin)
ov->localskin = &skins[actor->target->player->localskin - 1];
ov->skinlocal = actor->target->skinlocal;
if (ov->skinlocal || actor->target->player->localskin)
ov->localskin = &K_GetSkinArray(ov->skinlocal)[actor->target->player->localskin - 1];
P_SetMobjState(ov, actor->info->seestate); // S_PLAY_SIGN
}