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

Backends/SDL2/Controller: Start improving error handling

Browse source 
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
This commit is contained in:
Gabriel Ravier 2020-04-11 23:29:49 +02:00
parent f2b2c071a2
commit 4127efb8f8
1 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -7,6 +7,7 @@
#include "SDL.h" #include "SDL.h"
#include "../../WindowsWrapper.h" #include "../../WindowsWrapper.h"
#include "../Misc.h"
#define DEADZONE 10000; #define DEADZONE 10000;
@ -16,7 +17,11 @@ static Sint16 *axis_neutrals;
BOOL ControllerBackend_Init(void) BOOL ControllerBackend_Init(void)
{ {
SDL_InitSubSystem(SDL_INIT_JOYSTICK); if (SDL_InitSubSystem(SDL_INIT_JOYSTICK) < 0)
{
Backend_PrintError("Couldn't initialise joystack SDL2 subsystem : %s", SDL_GetError());
return FALSE;
}
return TRUE; return TRUE;
} }
@ -41,7 +46,12 @@ BOOL ControllerBackend_GetJoystickStatus(JOYSTICK_STATUS *status)
// Handle directional inputs // Handle directional inputs
const Sint16 joystick_x = SDL_JoystickGetAxis(joystick, 0); const Sint16 joystick_x = SDL_JoystickGetAxis(joystick, 0);
if (!joystick_x)
Backend_PrintError("Failed to get current state of X axis control on joystick : %s", SDL_GetError());
const Sint16 joystick_y = SDL_JoystickGetAxis(joystick, 1); const Sint16 joystick_y = SDL_JoystickGetAxis(joystick, 1);
if (!joystick_y)
Backend_PrintError("Failed to get current state of Y axis control on joystick : %s", SDL_GetError());
status->bLeft = joystick_x < axis_neutrals[0] - DEADZONE; status->bLeft = joystick_x < axis_neutrals[0] - DEADZONE;
status->bRight = joystick_x > axis_neutrals[0] + DEADZONE; status->bRight = joystick_x > axis_neutrals[0] + DEADZONE;
@ -50,8 +60,16 @@ BOOL ControllerBackend_GetJoystickStatus(JOYSTICK_STATUS *status)
// Handle button inputs // Handle button inputs
int total_buttons = SDL_JoystickNumButtons(joystick); int total_buttons = SDL_JoystickNumButtons(joystick);
if (total_buttons < 0)
Backend_PrintError("Failed to get number of buttons on joystick : %s", SDL_GetError());
int total_axes = SDL_JoystickNumAxes(joystick); int total_axes = SDL_JoystickNumAxes(joystick);
if (total_axes < 0)
Backend_PrintError("Failed to get number of general axis controls on joystick : %s", SDL_GetError());
int total_hats = SDL_JoystickNumHats(joystick); int total_hats = SDL_JoystickNumHats(joystick);
if (total_hats < 0)
Backend_PrintError("Failed to get number of POV hats on joystick : %s", SDL_GetError());
unsigned int buttons_done = 0; unsigned int buttons_done = 0;
@ -81,7 +99,7 @@ BOOL ControllerBackend_GetJoystickStatus(JOYSTICK_STATUS *status)
} }
// Then the joystick hats // Then the joystick hats
for (int i = 0; i < total_axes; ++i) for (int i = 0; i < total_hats; ++i)
{ {
Uint8 hat = SDL_JoystickGetHat(joystick, i); Uint8 hat = SDL_JoystickGetHat(joystick, i);