From 3973851dd2ba53bc4a0968d55faaabbd2b740262 Mon Sep 17 00:00:00 2001 From: Alug Date: Fri, 16 Aug 2024 00:09:08 +0200 Subject: [PATCH] add toggles for gamepad led stuff --- src/d_main.c | 5 +++-- src/d_netcmd.c | 10 ++++++++++ src/g_input.c | 20 ++++++++++++++++++++ src/g_input.h | 2 ++ src/m_menu.c | 16 ++++++++++++---- 5 files changed, 47 insertions(+), 6 deletions(-) diff --git a/src/d_main.c b/src/d_main.c index ade74830c..22a11171a 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -176,9 +176,10 @@ static inline void D_DeviceLEDTick(void) UINT16 color[MAXSPLITSCREENPLAYERS]; UINT16 curcolor[MAXSPLITSCREENPLAYERS]; - // no gamepads connected - if (I_NumJoys() == 0) + if (I_NumJoys() == 0 || (cv_gamepadled[0].value == 0 && cv_gamepadled[1].value == 0 && cv_gamepadled[2].value == 0 && cv_gamepadled[3].value == 0)) + { return; + } for (i = 0; i <= splitscreen; i++) { diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 2c0d9ebf3..2480611c0 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -1079,6 +1079,16 @@ void D_RegisterClientCommands(void) CV_RegisterVar(&cv_rumble[2]); CV_RegisterVar(&cv_rumble[3]); + CV_RegisterVar(&cv_gamepadled[0]); + CV_RegisterVar(&cv_gamepadled[1]); + CV_RegisterVar(&cv_gamepadled[2]); + CV_RegisterVar(&cv_gamepadled[3]); + + CV_RegisterVar(&cv_ledpowerup[0]); + CV_RegisterVar(&cv_ledpowerup[1]); + CV_RegisterVar(&cv_ledpowerup[2]); + CV_RegisterVar(&cv_ledpowerup[3]); + CV_RegisterVar(&cv_usemouse); CV_RegisterVar(&cv_usemouse2); CV_RegisterVar(&cv_invertmouse); diff --git a/src/g_input.c b/src/g_input.c index 00a57d7bc..90de813b2 100644 --- a/src/g_input.c +++ b/src/g_input.c @@ -52,6 +52,20 @@ consvar_t cv_rumble[MAXSPLITSCREENPLAYERS] = { {"rumble4", "Off", CV_SAVE, CV_OnOff, rumble_off_handle4, 0, NULL, NULL, 0, 0, NULL} }; +consvar_t cv_gamepadled[MAXSPLITSCREENPLAYERS] = { + {"gamepadled", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}, + {"gamepadled2", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}, + {"gamepadled3", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}, + {"gamepadled4", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL} +}; + +consvar_t cv_ledpowerup[MAXSPLITSCREENPLAYERS] = { + {"ledpowerup", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}, + {"ledpowerup2", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}, + {"ledpowerup3", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}, + {"ledpowerup4", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL} +}; + static void rumble_off_handle(void) { if (cv_rumble[0].value == 0) @@ -889,6 +903,9 @@ INT32 G_GetDeviceForPlayer(INT32 player) inline UINT16 G_GetSkinColor(INT32 player) { + if (gamestate == GS_LEVEL && cv_ledpowerup[player].value && (players[displayplayers[player]].kartstuff[k_invincibilitytimer] || players[displayplayers[player]].powers[pw_invulnerability] || players[displayplayers[player]].kartstuff[k_growshrinktimer])) + return players[displayplayers[player]].mo->color; + if (players[displayplayers[player]].skincolor && gamestate == GS_LEVEL) return players[displayplayers[player]].skincolor; @@ -920,6 +937,9 @@ void G_SetPlayerGamepadIndicatorColor(INT32 player, UINT16 color) I_Assert(player >= 0 && player < MAXSPLITSCREENPLAYERS); + if (cv_gamepadled[player].value == 0) + return; + device = G_GetDeviceForPlayer(player); if (device <= 0) diff --git a/src/g_input.h b/src/g_input.h index 8522be618..6799f6ca0 100644 --- a/src/g_input.h +++ b/src/g_input.h @@ -108,6 +108,8 @@ extern consvar_t cv_mousesens, cv_mouseysens; extern consvar_t cv_mousesens2, cv_mouseysens2; extern consvar_t cv_controlperkey, cv_turnsmooth; extern consvar_t cv_rumble[MAXSPLITSCREENPLAYERS]; +extern consvar_t cv_gamepadled[MAXSPLITSCREENPLAYERS]; +extern consvar_t cv_ledpowerup[MAXSPLITSCREENPLAYERS]; extern INT32 mousex, mousey; extern INT32 mlooky; //mousey with mlookSensitivity diff --git a/src/m_menu.c b/src/m_menu.c index d72a803ef..ab7e06b1b 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -1229,6 +1229,8 @@ static menuitem_t OP_Joystick1Menu[] = {IT_STRING | IT_CVAR, NULL, "Y deadzone" , &cv_ydeadzone , 150}, {IT_STRING | IT_CVAR, NULL, "Controller Rumble" , &cv_rumble[0] , 170}, + {IT_STRING | IT_CVAR, NULL, "Set LED to skin color" , &cv_gamepadled[0] , 180}, + {IT_STRING | IT_CVAR, NULL, "Flash LED on powerups" , &cv_ledpowerup[0] , 190}, }; static menuitem_t OP_Joystick2Menu[] = @@ -1249,6 +1251,8 @@ static menuitem_t OP_Joystick2Menu[] = {IT_STRING | IT_CVAR, NULL, "Y deadzone" , &cv_ydeadzone2 , 150}, {IT_STRING | IT_CVAR, NULL, "Controller Rumble" , &cv_rumble[1] , 170}, + {IT_STRING | IT_CVAR, NULL, "Set LED to skin color" , &cv_gamepadled[1] , 180}, + {IT_STRING | IT_CVAR, NULL, "Flash LED on powerups" , &cv_ledpowerup[1] , 190}, }; static menuitem_t OP_Joystick3Menu[] = @@ -1269,6 +1273,8 @@ static menuitem_t OP_Joystick3Menu[] = {IT_STRING | IT_CVAR, NULL, "Y deadzone" , &cv_ydeadzone3 , 150}, {IT_STRING | IT_CVAR, NULL, "Controller Rumble" , &cv_rumble[2] , 170}, + {IT_STRING | IT_CVAR, NULL, "Set LED to skin color" , &cv_gamepadled[2] , 180}, + {IT_STRING | IT_CVAR, NULL, "Flash LED on powerups" , &cv_ledpowerup[2] , 190}, }; static menuitem_t OP_Joystick4Menu[] = @@ -1289,6 +1295,8 @@ static menuitem_t OP_Joystick4Menu[] = {IT_STRING | IT_CVAR, NULL, "Y deadzone" , &cv_ydeadzone4 , 150}, {IT_STRING | IT_CVAR, NULL, "Controller Rumble" , &cv_rumble[3] , 170}, + {IT_STRING | IT_CVAR, NULL, "Set LED to skin color" , &cv_gamepadled[3] , 180}, + {IT_STRING | IT_CVAR, NULL, "Flash LED on powerups" , &cv_ledpowerup[3] , 190}, }; static menuitem_t OP_JoystickSetMenu[] = @@ -2812,10 +2820,10 @@ menu_t OP_ControlsDef = DEFAULTMENUSTYLE("M_CONTRO", OP_ControlsMenu, &OP_MainDe //WTF menu_t OP_MouseOptionsDef = DEFAULTMENUSTYLE("M_CONTRO", OP_MouseOptionsMenu, &OP_ControlsDef, 60, 30); menu_t OP_AllControlsDef = CONTROLMENUSTYLE(OP_AllControlsMenu, &OP_ControlsDef); -menu_t OP_Joystick1Def = DEFAULTMENUSTYLE("M_CONTRO", OP_Joystick1Menu, &OP_AllControlsDef, 60, 30); -menu_t OP_Joystick2Def = DEFAULTMENUSTYLE("M_CONTRO", OP_Joystick2Menu, &OP_AllControlsDef, 60, 30); -menu_t OP_Joystick3Def = DEFAULTMENUSTYLE("M_CONTRO", OP_Joystick3Menu, &OP_AllControlsDef, 60, 30); -menu_t OP_Joystick4Def = DEFAULTMENUSTYLE("M_CONTRO", OP_Joystick4Menu, &OP_AllControlsDef, 60, 30); +menu_t OP_Joystick1Def = DEFAULTMENUSTYLE("M_CONTRO", OP_Joystick1Menu, &OP_AllControlsDef, 60, 16); +menu_t OP_Joystick2Def = DEFAULTMENUSTYLE("M_CONTRO", OP_Joystick2Menu, &OP_AllControlsDef, 60, 16); +menu_t OP_Joystick3Def = DEFAULTMENUSTYLE("M_CONTRO", OP_Joystick3Menu, &OP_AllControlsDef, 60, 16); +menu_t OP_Joystick4Def = DEFAULTMENUSTYLE("M_CONTRO", OP_Joystick4Menu, &OP_AllControlsDef, 60, 16); menu_t OP_JoystickSetDef = { "M_CONTRO",