Merge branch 'default-skincolor-pad-led-color' into 'master'

Use M_GetCvPlayerColor for pad LED color

See merge request KartKrew/Kart!1605
This commit is contained in:
toaster 2023-11-05 18:25:53 +00:00
commit 182820ad62

View file

@ -15,6 +15,7 @@
#include "doomstat.h"
#include "g_input.h"
#include "keys.h"
#include "k_menu.h"
#include "hu_stuff.h" // need HUFONT start & end
#include "d_net.h"
#include "console.h"
@ -219,14 +220,7 @@ void G_SetPlayerGamepadIndicatorToPlayerColor(INT32 player)
return;
}
skincolor = cv_playercolor[player].value;
if (skincolor == SKINCOLOR_NONE)
{
INT32 skin = cv_skin[player].value;
if (skin == -1)
skin = 0;
skincolor = skins[skin].prefcolor;
}
skincolor = M_GetCvPlayerColor(player);
byte_color = V_GetColor(skincolors[skincolor].ramp[8]).s;