Merge branch 'disable-xinput' into 'next'

-noxinput command line parameter

See merge request KartKrew/Kart-Public!21
This commit is contained in:
Sal 2019-01-11 20:23:39 -05:00
commit 2bd88fd6f8

View file

@ -2166,6 +2166,12 @@ void I_InitJoystick(void)
if (M_CheckParm("-nojoy"))
return;
if (M_CheckParm("-noxinput"))
SDL_SetHintWithPriority("SDL_XINPUT_ENABLED", "0", SDL_HINT_OVERRIDE);
if (M_CheckParm("-nohidapi"))
SDL_SetHintWithPriority("SDL_JOYSTICK_HIDAPI", "0", SDL_HINT_OVERRIDE);
if (SDL_WasInit(SDL_INIT_JOYSTICK) == 0)
{
CONS_Printf("I_InitJoystick()...\n");