New -noxinput and -nohidapi command line parameters.

This commit is contained in:
Steel Titanium 2019-03-03 22:57:09 -05:00
parent 0051eb7039
commit 9542a47f7f

View file

@ -1402,7 +1402,13 @@ static int joy_open2(const char *fname)
void I_InitJoystick(void) void I_InitJoystick(void)
{ {
I_ShutdownJoystick(); I_ShutdownJoystick();
SDL_SetHintWithPriority("SDL_XINPUT_ENABLED", "0", SDL_HINT_OVERRIDE);
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 (!strcmp(cv_usejoystick.string, "0") || M_CheckParm("-nojoy")) if (!strcmp(cv_usejoystick.string, "0") || M_CheckParm("-nojoy"))
return; return;
if (joy_open(cv_usejoystick.string) != -1) if (joy_open(cv_usejoystick.string) != -1)
@ -1418,7 +1424,13 @@ void I_InitJoystick(void)
void I_InitJoystick2(void) void I_InitJoystick2(void)
{ {
I_ShutdownJoystick2(); I_ShutdownJoystick2();
SDL_SetHintWithPriority("SDL_XINPUT_ENABLED", "0", SDL_HINT_OVERRIDE);
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 (!strcmp(cv_usejoystick2.string, "0") || M_CheckParm("-nojoy")) if (!strcmp(cv_usejoystick2.string, "0") || M_CheckParm("-nojoy"))
return; return;
if (joy_open2(cv_usejoystick2.string) != -1) if (joy_open2(cv_usejoystick2.string) != -1)