Add profile color and followercolor to Default color rotation on character select screen

This commit is contained in:
zander3312 2025-10-20 19:04:05 +00:00 committed by Eidolon
parent 2270813eee
commit 17556495f6

View file

@ -1019,7 +1019,10 @@ static void M_HandleColorRotate(setup_player_t *p, UINT8 num)
{ {
if (p->skin >= 0) if (p->skin >= 0)
{ {
p->color = SKINCOLOR_NONE; if (p->color == SKINCOLOR_NONE)
p->color = PR_GetProfile(p->profilen)->color;
else
p->color = SKINCOLOR_NONE;
p->rotate = CSROTATETICS; p->rotate = CSROTATETICS;
p->hitlag = true; p->hitlag = true;
S_StartSound(NULL, sfx_s3k7b); //sfx_s3kc3s S_StartSound(NULL, sfx_s3k7b); //sfx_s3kc3s
@ -1252,8 +1255,11 @@ static void M_HandleFollowerColorRotate(setup_player_t *p, UINT8 num)
} }
else if (M_MenuExtraPressed(num)) else if (M_MenuExtraPressed(num))
{ {
UINT16 profile_followercolor = PR_GetProfile(p->profilen)->followercolor;
if (p->followercolor == FOLLOWERCOLOR_MATCH) if (p->followercolor == FOLLOWERCOLOR_MATCH)
p->followercolor = FOLLOWERCOLOR_OPPOSITE; p->followercolor = FOLLOWERCOLOR_OPPOSITE;
else if (p->followercolor == FOLLOWERCOLOR_OPPOSITE && profile_followercolor != FOLLOWERCOLOR_OPPOSITE && profile_followercolor != FOLLOWERCOLOR_MATCH)
p->followercolor = profile_followercolor;
else if (p->followercolor == SKINCOLOR_NONE) else if (p->followercolor == SKINCOLOR_NONE)
p->followercolor = FOLLOWERCOLOR_MATCH; p->followercolor = FOLLOWERCOLOR_MATCH;
else else