diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 45a736794..1a93cbd75 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -1028,7 +1028,6 @@ void D_RegisterClientCommands(void) { CV_RegisterVar(&cv_rumble[i]); CV_RegisterVar(&cv_gamepadled[i]); - CV_RegisterVar(&cv_ledpowerup[i]); } CV_RegisterVar(&cv_usemouse); diff --git a/src/g_input.c b/src/g_input.c index 963663504..43b7f48ca 100644 --- a/src/g_input.c +++ b/src/g_input.c @@ -58,44 +58,35 @@ consvar_t cv_rumble[MAXSPLITSCREENPLAYERS] = { {"rumble4", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, rumble_off_handle4, 0, NULL, NULL, 0, 0, NULL} }; +static CV_PossibleValue_t gamepadled_cons_t[] = {{0, "Off"}, {1, "Skincolor"}, {2, "Mobjcolor"}, {0, NULL}}; consvar_t cv_gamepadled[MAXSPLITSCREENPLAYERS] = { - {"gamepadled", "On", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, led_off_handle, 0, NULL, NULL, 0, 0, NULL}, - {"gamepadled2", "On", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, led_off_handle2, 0, NULL, NULL, 0, 0, NULL}, - {"gamepadled3", "On", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, led_off_handle3, 0, NULL, NULL, 0, 0, NULL}, - {"gamepadled4", "On", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, led_off_handle4, 0, NULL, NULL, 0, 0, NULL} -}; - -consvar_t cv_ledpowerup[MAXSPLITSCREENPLAYERS] = { - {"ledpowerup", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, led_off_handle, 0, NULL, NULL, 0, 0, NULL}, - {"ledpowerup2", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, led_off_handle2, 0, NULL, NULL, 0, 0, NULL}, - {"ledpowerup3", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, led_off_handle3, 0, NULL, NULL, 0, 0, NULL}, - {"ledpowerup4", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, led_off_handle4, 0, NULL, NULL, 0, 0, NULL} + {"gamepadled", "Skincolor", CV_SAVE|CV_CALL|CV_NOINIT, gamepadled_cons_t, led_off_handle, 0, NULL, NULL, 0, 0, NULL}, + {"gamepadled2", "Skincolor", CV_SAVE|CV_CALL|CV_NOINIT, gamepadled_cons_t, led_off_handle2, 0, NULL, NULL, 0, 0, NULL}, + {"gamepadled3", "Skincolor", CV_SAVE|CV_CALL|CV_NOINIT, gamepadled_cons_t, led_off_handle3, 0, NULL, NULL, 0, 0, NULL}, + {"gamepadled4", "Skincolor", CV_SAVE|CV_CALL|CV_NOINIT, gamepadled_cons_t, led_off_handle4, 0, NULL, NULL, 0, 0, NULL} }; static void rumble_off_handle(void) { - if (cv_rumble[0].value == 0) + if (!cv_rumble[0].value) G_ResetPlayerDeviceRumble(0); } - static void rumble_off_handle2(void) { - if (cv_rumble[1].value == 0) + if (!cv_rumble[1].value) G_ResetPlayerDeviceRumble(1); } - static void rumble_off_handle3(void) { - if (cv_rumble[2].value == 0) + if (!cv_rumble[2].value) G_ResetPlayerDeviceRumble(2); } - static void rumble_off_handle4(void) { - if (cv_rumble[3].value == 0) + if (!cv_rumble[3].value) G_ResetPlayerDeviceRumble(3); } @@ -104,19 +95,16 @@ static void led_off_handle(void) G_ResetPlayerGamepadIndicatorColor(0); } - static void led_off_handle2(void) { G_ResetPlayerGamepadIndicatorColor(1); } - static void led_off_handle3(void) { G_ResetPlayerGamepadIndicatorColor(2); } - static void led_off_handle4(void) { G_ResetPlayerGamepadIndicatorColor(3); @@ -900,13 +888,16 @@ UINT16 G_GetSkinColor(INT32 playernum) { player_t *player = &players[displayplayers[playernum]]; - // make rgb rainbow vomit when invul or flash blue when grow - if (cv_ledpowerup[playernum].value && player->mo && (player->kartstuff[k_invincibilitytimer] || player->kartstuff[k_growshrinktimer] || player->powers[pw_invulnerability])) - return player->mo->color; + if (player) + { + // make rgb rainbow vomit when invul or flash blue when grow + if ((cv_gamepadled[playernum].value == 2) && player->mo && player->mo->color) + return player->mo->color; - // take actual player skincolour when ingame - if (player->skincolor) - return player->skincolor; + // take actual player skincolour when ingame + if (player->skincolor) + return player->skincolor; + } } // otherwise just fallback to whatever the cvar is diff --git a/src/g_input.h b/src/g_input.h index 478dae8f1..d801d1020 100644 --- a/src/g_input.h +++ b/src/g_input.h @@ -109,7 +109,6 @@ extern consvar_t cv_mousesens, cv_mouseysens; 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 aa06f2203..babf6491c 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -1290,8 +1290,7 @@ static menuitem_t OP_Joystick1Menu[] = {IT_HEADER, NULL, "Miscellaneous", NULL, 112}, {IT_STRING | IT_CVAR, NULL, "Controller Rumble" , &cv_rumble[0] , 120}, - {IT_STRING | IT_CVAR, NULL, "Set LED to skin color" , &cv_gamepadled[0] , 125}, - {IT_STRING | IT_CVAR, NULL, "Flash LED on powerups" , &cv_ledpowerup[0] , 130}, + {IT_STRING | IT_CVAR, NULL, "Set LED to Player color", &cv_gamepadled[0] , 125}, }; static menuitem_t OP_Joystick2Menu[] = @@ -1321,8 +1320,7 @@ static menuitem_t OP_Joystick2Menu[] = {IT_HEADER, NULL, "Miscellaneous", NULL, 112}, {IT_STRING | IT_CVAR, NULL, "Controller Rumble" , &cv_rumble[1] , 120}, - {IT_STRING | IT_CVAR, NULL, "Set LED to skin color" , &cv_gamepadled[1] , 125}, - {IT_STRING | IT_CVAR, NULL, "Flash LED on powerups" , &cv_ledpowerup[1] , 130}, + {IT_STRING | IT_CVAR, NULL, "Set LED to Player color", &cv_gamepadled[1] , 125}, }; static menuitem_t OP_Joystick3Menu[] = @@ -1352,8 +1350,7 @@ static menuitem_t OP_Joystick3Menu[] = {IT_HEADER, NULL, "Miscellaneous", NULL, 112}, {IT_STRING | IT_CVAR, NULL, "Controller Rumble" , &cv_rumble[2] , 120}, - {IT_STRING | IT_CVAR, NULL, "Set LED to skin color" , &cv_gamepadled[2] , 125}, - {IT_STRING | IT_CVAR, NULL, "Flash LED on powerups" , &cv_ledpowerup[2] , 130}, + {IT_STRING | IT_CVAR, NULL, "Set LED to Player color", &cv_gamepadled[2] , 125}, }; static menuitem_t OP_Joystick4Menu[] = @@ -1383,8 +1380,7 @@ static menuitem_t OP_Joystick4Menu[] = {IT_HEADER, NULL, "Miscellaneous", NULL, 112}, {IT_STRING | IT_CVAR, NULL, "Controller Rumble" , &cv_rumble[3] , 120}, - {IT_STRING | IT_CVAR, NULL, "Set LED to skin color" , &cv_gamepadled[3] , 125}, - {IT_STRING | IT_CVAR, NULL, "Flash LED on powerups" , &cv_ledpowerup[3] , 130}, + {IT_STRING | IT_CVAR, NULL, "Set LED to Player color", &cv_gamepadled[3] , 125}, }; static menuitem_t OP_JoystickSetMenu[] = @@ -3178,10 +3174,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 = DEFAULTSCROLLSTYLE("M_CONTRO", OP_Joystick1Menu, &OP_AllControlsDef, 60, 36); -menu_t OP_Joystick2Def = DEFAULTSCROLLSTYLE("M_CONTRO", OP_Joystick2Menu, &OP_AllControlsDef, 60, 36); -menu_t OP_Joystick3Def = DEFAULTSCROLLSTYLE("M_CONTRO", OP_Joystick3Menu, &OP_AllControlsDef, 60, 36); -menu_t OP_Joystick4Def = DEFAULTSCROLLSTYLE("M_CONTRO", OP_Joystick4Menu, &OP_AllControlsDef, 60, 36); +menu_t OP_Joystick1Def = DEFAULTSCROLLSTYLE("M_CONTRO", OP_Joystick1Menu, &OP_AllControlsDef, 30, 36); +menu_t OP_Joystick2Def = DEFAULTSCROLLSTYLE("M_CONTRO", OP_Joystick2Menu, &OP_AllControlsDef, 30, 36); +menu_t OP_Joystick3Def = DEFAULTSCROLLSTYLE("M_CONTRO", OP_Joystick3Menu, &OP_AllControlsDef, 30, 36); +menu_t OP_Joystick4Def = DEFAULTSCROLLSTYLE("M_CONTRO", OP_Joystick4Menu, &OP_AllControlsDef, 30, 36); menu_t OP_JoystickSetDef = { "M_CONTRO",