skinlocal deez nuts

This commit is contained in:
Alug committed 2025-05-04 01:36:01 +02:00
1 parent 46f3529165
commit b71c1152c6
2 files changed
+10 -19

No files matched your search

+2 -3
View File
@@ -10655,7 +10655,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;
@@ -10668,7 +10667,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);
@@ -10718,7 +10717,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);
+8 -16
View File
@@ -3996,10 +3996,7 @@ void A_SignPlayer(mobj_t *actor)
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.
@@ -4011,18 +4008,13 @@ void A_SignPlayer(mobj_t *actor)
P_SetTarget(&ov->target, actor);
ov->color = actor->target->player->skincolor;
ov->skin = &skins[actor->target->player->skin];
if (actor->target->skinlocal) {
// needs - 1 or else it pukes an error out
// same thing happens on p_mobj.c
ov->localskin = &localskins[actor->target->player->localskin - 1];
ov->skinlocal = actor->target->skinlocal;
} else {
// needs - 1 or else it pukes an error out
// same thing happens on p_mobj.c
if (actor->target->player->localskin)
ov->localskin = &skins[actor->target->player->localskin - 1];
ov->skinlocal = actor->target->skinlocal;
}
// needs - 1 or else it pukes an error out
// same thing happens on p_mobj.c
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
}