From 3226a5d6995c6e00198b80f02cbb1c2ad1c125a3 Mon Sep 17 00:00:00 2001 From: lachwright Date: Thu, 9 Jul 2020 05:56:11 +0800 Subject: [PATCH] Fix custom skincolors being fullbright & signpost backgrounds using incorrect color shades --- src/p_enemy.c | 2 +- src/p_mobj.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/p_enemy.c b/src/p_enemy.c index 9571b0b4a..fd30f8e38 100644 --- a/src/p_enemy.c +++ b/src/p_enemy.c @@ -5214,7 +5214,7 @@ void A_SignPlayer(mobj_t *actor) actor->tracer->color = signcolor; if (signcolor && signcolor < numskincolors) - signframe += (15 - skincolors[facecolor].invshade); + signframe += (15 - skincolors[skincolors[signcolor].invcolor].invshade); actor->tracer->frame = signframe; } diff --git a/src/p_mobj.c b/src/p_mobj.c index 62bcad500..c26308a59 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -442,7 +442,7 @@ boolean P_SetPlayerMobjState(mobj_t *mobj, statenum_t state) mobj->sprite2 = spr2; mobj->frame = frame|(st->frame&~FF_FRAMEMASK); - if (mobj->color >= FIRSTSUPERCOLOR && mobj->color < numskincolors) // Super colours? Super bright! + if (player->powers[pw_super] || (player->powers[pw_carry] == CR_NIGHTSMODE && (player->charflags & (SF_SUPER|SF_NONIGHTSSUPER)) == SF_SUPER)) // Super colours? Super bright! mobj->frame |= FF_FULLBRIGHT; } // Regular sprites