stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-02-05 07:51:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'sdl-noxinput-nohidapi' into 'master'

Browse source 
-noxinput and -nohidapi command line parameters.

See merge request STJr/SRB2!468
This commit is contained in:
Monster Iestyn 2019-03-20 17:33:04 -04:00
commit ecb6322a52
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/sdl/i_system.c
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)