From a0ee75ebf44a87ae0e69e4788c474dee364845fc Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 29 Jul 2024 01:11:54 +0200 Subject: [PATCH] give rgb custom color support, change rgb light color earlier in Color_OnChange so it always unconditionally changes the color also --- src/d_main.c | 3 --- src/d_netcmd.c | 4 ++-- src/g_input.c | 7 +++++-- src/g_input.h | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/d_main.c b/src/d_main.c index 0f0de321c..766335768 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -1849,9 +1849,6 @@ void D_SRB2Main(void) CONS_Printf("ST_Init(): Init status bar.\n"); ST_Init(); - if (!dedicated) - G_SetPlayerGamepadIndicatorToPlayerColor(); // no idea where else to throw it lol - // Set up splitscreen players before joining! if (!dedicated && (M_CheckParm("-splitscreen") && M_IsNextParm())) { diff --git a/src/d_netcmd.c b/src/d_netcmd.c index b47ef6618..9d246c434 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -6064,6 +6064,8 @@ static void Command_SkinSearch(void) */ static void Color_OnChange(void) { + G_SetPlayerGamepadIndicatorToPlayerColor(0); // i want this to always change so its here + if (!Playing()) return; // do whatever you want @@ -6083,8 +6085,6 @@ static void Color_OnChange(void) CV_StealthSetValue(&cv_playercolor, players[consoleplayer].skincolor); } - - G_SetPlayerGamepadIndicatorToPlayerColor(); } /** Sends a color change for the secondary splitscreen player, unless that diff --git a/src/g_input.c b/src/g_input.c index 86094fbf8..ad15f44ce 100644 --- a/src/g_input.c +++ b/src/g_input.c @@ -824,12 +824,15 @@ static const char *gamecontrolname[num_gamecontrols] = #include "k_kart.h" // ehhhhhh ill maybe add splitscreen support eventually lol -void G_SetPlayerGamepadIndicatorToPlayerColor(void) +void G_SetPlayerGamepadIndicatorToPlayerColor(UINT16 color) { UINT16 skincolor; byteColor_t byte_color; - skincolor = cv_playercolor.value; + if (color) + skincolor = color; + else + skincolor = cv_playercolor.value; byte_color = V_GetColor(colortranslations[skincolor][8]).s; diff --git a/src/g_input.h b/src/g_input.h index 25b1dc119..13b0fa508 100644 --- a/src/g_input.h +++ b/src/g_input.h @@ -130,7 +130,7 @@ extern INT32 gamecontrol4[num_gamecontrols][2]; // peace to my little coder fingers! // check a gamecontrol being active or not -void G_SetPlayerGamepadIndicatorToPlayerColor(void); +void G_SetPlayerGamepadIndicatorToPlayerColor(UINT16 color); // remaps the input event to a game control. void G_MapEventsToControls(event_t *ev);