diff --git a/src/k_kart.c b/src/k_kart.c index 3f3048278..f58a33395 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -10658,6 +10658,7 @@ 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; @@ -10670,7 +10671,7 @@ static void K_drawKartMinimapHead(mobj_t *mo, INT32 x, INT32 y, INT32 flags) #endif skin = K_GetMobjSkin(mo); - minimaphead = R_GetSkinFaceMini(player); + minimaphead = (skinlocal ? localfacemmapprefix : facemmapprefix)[K_GetMobjSkinNum(skin, skinlocal)]; 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); @@ -10720,7 +10721,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, mo->skinlocal); + colormap = R_GetLocalTranslationColormap(mo->skin, mo->localskin, mo->color, GTC_CACHE, skinlocal); V_DrawFixedPatch(amxpos, amypos, scale, flags, minimaphead, colormap); diff --git a/src/p_enemy.c b/src/p_enemy.c index 195df59b0..d500a0cb2 100644 --- a/src/p_enemy.c +++ b/src/p_enemy.c @@ -3996,7 +3996,10 @@ void A_SignPlayer(mobj_t *actor) if (LUA_CallAction(A_SIGNPLAYER, actor)) return; - if (!actor->target || !actor->target->player) + if (!actor->target) + return; + + if (!actor->target->player) return; // Set the sign to be an appropriate background color for this player's skincolor. @@ -4011,9 +4014,11 @@ void A_SignPlayer(mobj_t *actor) // 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 }