ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SDL: Ensure polled axes exist

This commit is contained in:
Jeffrey Pfau 2015-04-21 21:36:34 -07:00
parent e0185740f7
commit aacab52a84
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/platform/sdl/sdl-events.c
View File

@ -242,32 +242,33 @@ void GBASDLPlayerLoadConfig(struct GBASDLPlayer* context, const struct Configura
const char* value; const char* value;
char* end; char* end;
int numAxes = SDL_JoystickNumAxes(context->joystick);
int axis; int axis;
value = GBAInputGetCustomValue(config, SDL_BINDING_BUTTON, "tiltAxisX", name); value = GBAInputGetCustomValue(config, SDL_BINDING_BUTTON, "tiltAxisX", name);
if (value) { if (value) {
axis = strtol(value, &end, 0); axis = strtol(value, &end, 0);
if (end && !*end) { if (axis >= 0 && axis < numAxes && end && !*end) {
context->rotation.axisX = axis; context->rotation.axisX = axis;
} }
} }
value = GBAInputGetCustomValue(config, SDL_BINDING_BUTTON, "tiltAxisY", name); value = GBAInputGetCustomValue(config, SDL_BINDING_BUTTON, "tiltAxisY", name);
if (value) { if (value) {
axis = strtol(value, &end, 0); axis = strtol(value, &end, 0);
if (end && !*end) { if (axis >= 0 && axis < numAxes && end && !*end) {
context->rotation.axisY = axis; context->rotation.axisY = axis;
} }
} }
value = GBAInputGetCustomValue(config, SDL_BINDING_BUTTON, "gyroAxisX", name); value = GBAInputGetCustomValue(config, SDL_BINDING_BUTTON, "gyroAxisX", name);
if (value) { if (value) {
axis = strtol(value, &end, 0); axis = strtol(value, &end, 0);
if (end && !*end) { if (axis >= 0 && axis < numAxes && end && !*end) {
context->rotation.gyroX = axis; context->rotation.gyroX = axis;
} }
} }
value = GBAInputGetCustomValue(config, SDL_BINDING_BUTTON, "gyroAxisY", name); value = GBAInputGetCustomValue(config, SDL_BINDING_BUTTON, "gyroAxisY", name);
if (value) { if (value) {
axis = strtol(value, &end, 0); axis = strtol(value, &end, 0);
if (end && !*end) { if (axis >= 0 && axis < numAxes && end && !*end) {
context->rotation.gyroY = axis; context->rotation.gyroY = axis;
} }
} }