From 475b92174fa90035c4ad1049995559e42026558e Mon Sep 17 00:00:00 2001 From: NepDisk Date: Fri, 19 Dec 2025 18:19:36 -0500 Subject: [PATCH] Fix player->skincolor always being set on player->mo This should maybe color maangement on players just as easy as v1 without having to use dye --- src/k_kart.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index fa742bd80..6c20790d6 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -7603,8 +7603,14 @@ void K_KartResetPlayerColor(player_t *player) if (player->mo->health <= 0 || player->playerstate == PST_DEAD) // Override everything { - player->mo->colorized = (player->dye != 0); - player->mo->color = player->dye ? player->dye : player->skincolor; + if (player->dye) + { + player->mo->colorized = (player->dye != 0); + player->mo->color = player->dye; + } + else + player->mo->color = player->skincolor; + goto finalise; } @@ -7680,10 +7686,10 @@ void K_KartResetPlayerColor(player_t *player) fullbright = true; goto finalise; } - else + else if (player->dye) { player->mo->colorized = (player->dye != 0); - player->mo->color = player->dye ? player->dye : player->skincolor; + player->mo->color = player->dye; } finalise: