Alex/REDRIVER2
1
0
Fork 0
mirror of https://github.com/OpenDriver2/REDRIVER2.git synced 2024-11-23 02:42:38 +01:00
Code Issues Projects Releases Wiki Activity

- [Psy-X] better PadInitDirect flow

Browse Source
This commit is contained in:
Ilya Shurumov 2020-11-29 18:49:00 +06:00
parent 0171e6f6fb
commit ec6c86a020
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src_rebuild/PsyX/LIBPAD.C
View File

@ -16,6 +16,9 @@ void PadInitDirect(unsigned char* pad1, unsigned char* pad2)
// do not init second time!
if (keyboardState != NULL)
return;
// init keyboard state
keyboardState = SDL_GetKeyboardState(NULL);
if (pad1 != NULL)
{
@ -48,28 +51,23 @@ void PadInitDirect(unsigned char* pad1, unsigned char* pad2)
if (SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER) < 0)
{
eprinterr("Failed to initialise subsystem GAMECONTROLLER\n");
eprinterr("Failed to initialise SDL GameController subsystem!\n");
return;
}
// Add more controllers from custom file
SDL_GameControllerAddMappingsFromFile("gamecontrollerdb.txt");
if (SDL_NumJoysticks() < 1)
// immediately open controllers
int numJoysticks = SDL_NumJoysticks();
for (int i = 0; i < numJoysticks && i < MAX_CONTROLLERS; i++)
{
eprinterr("Failed to locate a connected gamepad!\n");
}
else
{
for (int i = 0; i < SDL_NumJoysticks(); i++)
if (SDL_IsGameController(i))
{
if (SDL_IsGameController(i) && i < MAX_CONTROLLERS)
{
padHandle[i] = SDL_GameControllerOpen(i);///@TODO close joysticks
}
padHandle[i] = SDL_GameControllerOpen(i); //@TODO close joysticks
}
}
keyboardState = SDL_GetKeyboardState(NULL);
}
void PadInitMtap(unsigned char* unk00, unsigned char* unk01)