stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-02 01:03:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Disable XINPUT before initing the joy subsystem

Browse source
This commit is contained in:
mazmazz 2018-12-06 14:03:46 -05:00
parent 6694b7d679
commit 60afce5771
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/sdl/i_system.c
View file

@ -1380,13 +1380,12 @@ void I_InitJoystick(void)
if (SDL_WasInit(SDL_INIT_JOYSTICK) == 0) if (SDL_WasInit(SDL_INIT_JOYSTICK) == 0)
{ {
CONS_Printf("Initing joy system\n"); CONS_Printf("Initing joy system\n");
SDL_SetHintWithPriority("SDL_XINPUT_ENABLED", "0", SDL_HINT_OVERRIDE);
if (SDL_InitSubSystem(SDL_INIT_JOYSTICK) == -1) if (SDL_InitSubSystem(SDL_INIT_JOYSTICK) == -1)
{ {
CONS_Printf(M_GetText("Couldn't initialize joystick: %s\n"), SDL_GetError()); CONS_Printf(M_GetText("Couldn't initialize joystick: %s\n"), SDL_GetError());
return; return;
} }
else
SDL_SetHintWithPriority("SDL_XINPUT_ENABLED", "0", SDL_HINT_OVERRIDE);
} }
if (strcmp(cv_usejoystick.string, "0") && joy_open(cv_usejoystick.string) != -1) if (strcmp(cv_usejoystick.string, "0") && joy_open(cv_usejoystick.string) != -1)
@ -1412,13 +1411,12 @@ void I_InitJoystick2(void)
if (SDL_WasInit(SDL_INIT_JOYSTICK) == 0) if (SDL_WasInit(SDL_INIT_JOYSTICK) == 0)
{ {
CONS_Printf("Initing joy system\n"); CONS_Printf("Initing joy system\n");
SDL_SetHintWithPriority("SDL_XINPUT_ENABLED", "0", SDL_HINT_OVERRIDE);
if (SDL_InitSubSystem(SDL_INIT_JOYSTICK) == -1) if (SDL_InitSubSystem(SDL_INIT_JOYSTICK) == -1)
{ {
CONS_Printf(M_GetText("Couldn't initialize joystick: %s\n"), SDL_GetError()); CONS_Printf(M_GetText("Couldn't initialize joystick: %s\n"), SDL_GetError());
return; return;
} }
else
SDL_SetHintWithPriority("SDL_XINPUT_ENABLED", "0", SDL_HINT_OVERRIDE);
} }
if (strcmp(cv_usejoystick2.string, "0") && joy_open2(cv_usejoystick2.string) != -1) if (strcmp(cv_usejoystick2.string, "0") && joy_open2(cv_usejoystick2.string) != -1)