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
This commit is contained in:
parent
de75ac5a91
commit
475b92174f
1 changed files with 10 additions and 4 deletions
14
src/k_kart.c
14
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:
|
||||
|
|
|
|||
Loading…
Reference in a new issue