duuqnd/cave-story-solaris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean-up SDL2 controller backend

Browse source
This commit is contained in:
Clownacy 2020-04-04 19:14:40 +01:00
parent e00ad1cd78
commit 7f6574117d
1 changed files with 15 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/Backends/SDL2/Controller.cpp
View file

@ -7,27 +7,32 @@
#include "../../WindowsWrapper.h" #include "../../WindowsWrapper.h"
// The original names for these variables are unknown static SDL_Joystick *joystick;
static SDL_Joystick *joystick = NULL; static int joystick_neutral_x;
static int joystick_neutral_x = 0; static int joystick_neutral_y;
static int joystick_neutral_y = 0;
// It looks like Pixel declared his functions early, so he could forward-reference
BOOL FindAndOpenDirectInputDevice(void);
BOOL ControllerBackend_Init(void) BOOL ControllerBackend_Init(void)
{ {
SDL_InitSubSystem(SDL_INIT_JOYSTICK); SDL_InitSubSystem(SDL_INIT_JOYSTICK);
if (!FindAndOpenDirectInputDevice()) for (int i = 0; i < SDL_NumJoysticks(); ++i)
return FALSE; {
printf("Joystick #%d connected - %s\n", i, SDL_JoystickNameForIndex(i));
if (joystick == NULL)
{
joystick = SDL_JoystickOpen(i);
if (joystick != NULL)
printf("Joystick #%d selected\n", i);
}
}
return TRUE; return TRUE;
} }
void ControllerBackend_Deinit(void) void ControllerBackend_Deinit(void)
{ {
// Close opened joystick (if exists)
if (joystick != NULL) if (joystick != NULL)
{ {
SDL_JoystickClose(joystick); SDL_JoystickClose(joystick);
@ -37,31 +42,6 @@ void ControllerBackend_Deinit(void)
SDL_QuitSubSystem(SDL_INIT_JOYSTICK); SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
} }
// The original name for this function and its variables are unknown.
// This function finds and hooks the first available DirectInput device (or SDL Joystick, in this case).
BOOL FindAndOpenDirectInputDevice(void)
{
int i;
for (i = 0; i < SDL_NumJoysticks(); ++i)
printf("Joystick #%d name: %s\n", i, SDL_JoystickNameForIndex(i));
// Open first available joystick
for (i = 0; i < SDL_NumJoysticks(); ++i)
{
joystick = SDL_JoystickOpen(i);
// Break as soon as a joystick is properly opened
if (joystick != NULL)
{
printf("Joystick #%d selected\n", i);
return TRUE;
}
}
return FALSE;
}
BOOL ControllerBackend_GetJoystickStatus(JOYSTICK_STATUS *status) BOOL ControllerBackend_GetJoystickStatus(JOYSTICK_STATUS *status)
{ {
if (joystick == NULL) if (joystick == NULL)