LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-19 12:14:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added love.joystick.loadGamepadMappings (resolves issue #842), and Joystick:saveGamepadMapping.

Browse Source 
The latter returns a mapping string, and the former loads a newline-separated list of mapping strings.
This commit is contained in:
Alex Szpakowski
2014-06-04 15:50:06 -03:00
parent dfa319e01a
commit 79b453653a
14 changed files with 166 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/joystick/sdl/Joystick.cpp
+8 -6
View File
@@ -191,12 +191,14 @@ bool Joystick::isDown(const std::vector<int> &buttonlist) const
if (!isConnected())
return false;
int num = getButtonCount();
int numbuttons = getButtonCount();
for (size_t i = 0; i < buttonlist.size(); i++)
for (int button : buttonlist)
{
int button = buttonlist[i];
if (button >= 0 && button < num && SDL_JoystickGetButton(joyhandle, button) == 1)
if (button < 0 || button >= numbuttons)
continue;
if (SDL_JoystickGetButton(joyhandle, button) == 1)
return true;
}
@@ -244,9 +246,9 @@ bool Joystick::isGamepadDown(const std::vector<GamepadButton> &blist) const
SDL_GameControllerButton sdlbutton;
for (size_t i = 0; i < blist.size(); i++)
for (GamepadButton button : blist)
{
if (!getConstant(blist[i], sdlbutton))
if (!getConstant(button, sdlbutton))
continue;
if (SDL_GameControllerGetButton(controller, sdlbutton) == 1)