From 0e9997f2cd2df7cd22c5b221c940b7e55798524d Mon Sep 17 00:00:00 2001 From: toaster Date: Wed, 20 Sep 2023 00:25:29 +0100 Subject: [PATCH] Character Select: If your profile's color/followercolor have not been unlocked, correct the visible colour to Default when selecting your Profile, instead of on Level start --- src/menus/play-char-select.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/menus/play-char-select.c b/src/menus/play-char-select.c index 52f7f648d..e3424d96d 100644 --- a/src/menus/play-char-select.c +++ b/src/menus/play-char-select.c @@ -181,6 +181,10 @@ static void M_SetupProfileGridPos(setup_player_t *p) p->followercategory = followers[p->followern].category; p->followercolor = pr->followercolor; + if (K_ColorUsable(p->followercolor, true, true) == false) + { + p->followercolor = SKINCOLOR_NONE; + } if (!R_SkinUsable(g_localplayers[0], i, false)) { @@ -196,7 +200,13 @@ static void M_SetupProfileGridPos(setup_player_t *p) alt++; p->clonenum = alt; + p->color = pr->color; + if (K_ColorUsable(p->color, false, true) == false) + { + p->color = SKINCOLOR_NONE; + } + } static void M_SetupMidGameGridPos(setup_player_t *p, UINT8 num) @@ -1256,13 +1266,6 @@ boolean M_CharacterSelectHandler(INT32 choice) p->skin = setup_chargrid[p->gridx][p->gridy].skinlist[p->clonenum]; } - // Keep profile colour. - /*if (p->mdepth < CSSTEP_COLORS) - { - p->color = skins[p->skin].prefcolor; - - }*/ - if (playersChanged == true) { setup_page = 0; // reset that.