give rgb custom color support, change rgb light color earlier in Color_OnChange
so it always unconditionally changes the color also
This commit is contained in:
1 parent
1665d9aaa3
commit
a0ee75ebf4
4 files changed
+8
-8
No files matched your search
@@ -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()))
|
||||
{
|
||||
|
||||
+2
-2
@@ -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
|
||||
|
||||
+5
-2
@@ -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;
|
||||
|
||||
|
||||
+1
-1
@@ -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);
|
||||
|
||||
Reference in new issue
Block a user