remove duped gamepad init from merge
This commit is contained in:
parent
55646fadab
commit
af933c086a
1 changed files with 1 additions and 10 deletions
|
|
@ -1326,6 +1326,7 @@ void I_InitJoystick(UINT8 index)
|
|||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (SDL_WasInit(SDL_INIT_GAMEPAD) == 0)
|
||||
{
|
||||
if (!SDL_InitSubSystem(SDL_INIT_GAMEPAD))
|
||||
|
|
@ -1335,16 +1336,6 @@ void I_InitJoystick(UINT8 index)
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
// if (SDL_WasInit(SDL_INIT_GAMEPAD) == 0)
|
||||
// {
|
||||
// if (!SDL_InitSubSystem(SDL_INIT_GAMEPAD))
|
||||
// {
|
||||
// CONS_Printf(M_GetText("Couldn't initialize gamepads: %s\n"), SDL_GetError());
|
||||
// return;
|
||||
// }
|
||||
// }
|
||||
|
||||
joystick_list = SDL_GetJoysticks(&num_joy);
|
||||
|
||||
if (joystick_list && cv_usejoystick[index].value > 0 && cv_usejoystick[index].value <= num_joy)
|
||||
|
|
|
|||
Loading…
Reference in a new issue