mirrors/raylib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated gamepad system with extra check

Browse Source 
Avoid out-of-bounds situation with button array
This commit is contained in:
Ray 2016-10-15 13:17:57 +02:00
parent 98d7a10c08
commit 9e285d8dc3
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core.c
View File

@ -1179,9 +1179,9 @@ float GetGamepadAxisMovement(int gamepad, int axis)
{ {
float value = 0; float value = 0;
if ((gamepad < MAX_GAMEPADS) && gamepadReady[gamepad]) if ((gamepad < MAX_GAMEPADS) && gamepadReady[gamepad] && (axis < MAX_GAMEPAD_AXIS))
{ {
if (axis < MAX_GAMEPAD_AXIS) value = gamepadAxisState[gamepad][axis]; value = gamepadAxisState[gamepad][axis];
} }
return value; return value;
@ -1192,7 +1192,7 @@ bool IsGamepadButtonPressed(int gamepad, int button)
{ {
bool pressed = false; bool pressed = false;
if ((gamepad < MAX_GAMEPADS) && gamepadReady[gamepad] && if ((gamepad < MAX_GAMEPADS) && gamepadReady[gamepad] && (button < MAX_GAMEPAD_BUTTONS) &&
(currentGamepadState[gamepad][button] != previousGamepadState[gamepad][button]) && (currentGamepadState[gamepad][button] != previousGamepadState[gamepad][button]) &&
(currentGamepadState[gamepad][button] == 1)) pressed = true; (currentGamepadState[gamepad][button] == 1)) pressed = true;
@ -1204,7 +1204,7 @@ bool IsGamepadButtonDown(int gamepad, int button)
{ {
bool result = false; bool result = false;
if ((gamepad < MAX_GAMEPADS) && gamepadReady[gamepad] && if ((gamepad < MAX_GAMEPADS) && gamepadReady[gamepad] && (button < MAX_GAMEPAD_BUTTONS) &&
(currentGamepadState[gamepad][button] == 1)) result = true; (currentGamepadState[gamepad][button] == 1)) result = true;
return result; return result;
@ -1215,7 +1215,7 @@ bool IsGamepadButtonReleased(int gamepad, int button)
{ {
bool released = false; bool released = false;
if ((gamepad < MAX_GAMEPADS) && gamepadReady[gamepad] && if ((gamepad < MAX_GAMEPADS) && gamepadReady[gamepad] && (button < MAX_GAMEPAD_BUTTONS) &&
(currentGamepadState[gamepad][button] != previousGamepadState[gamepad][button]) && (currentGamepadState[gamepad][button] != previousGamepadState[gamepad][button]) &&
(currentGamepadState[gamepad][button] == 0)) released = true; (currentGamepadState[gamepad][button] == 0)) released = true;
@ -1227,7 +1227,7 @@ bool IsGamepadButtonUp(int gamepad, int button)
{ {
bool result = false; bool result = false;
if ((gamepad < MAX_GAMEPADS) && gamepadReady[gamepad] && if ((gamepad < MAX_GAMEPADS) && gamepadReady[gamepad] && (button < MAX_GAMEPAD_BUTTONS) &&
(currentGamepadState[gamepad][button] == 0)) result = true; (currentGamepadState[gamepad][button] == 0)) result = true;
return result; return result;