mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 13:20:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix off-by-one bug in joypad ID handling.

Browse Source
This commit is contained in:
Themaister 2012-02-29 18:52:13 +01:00
parent 452f3f4c43
commit 47c9fda3c9
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libsnes.hpp
View File

@ -31,8 +31,6 @@ extern "C" {
#define SNES_DEVICE_ID_JOYPAD_L 10
#define SNES_DEVICE_ID_JOYPAD_R 11
#define SNES_DEVICE_ID_MAX_JOYPAD_BUTTON (SNES_DEVICE_ID_JOYPAD_R)
#define SNES_DEVICE_ID_MOUSE_X 0
#define SNES_DEVICE_ID_MOUSE_Y 1
#define SNES_DEVICE_ID_MOUSE_LEFT 2

6
ps3/menu.c
View File

@ -1036,7 +1036,7 @@ static void set_keybind_digital(uint64_t state, uint32_t system_joypad_id, uint3
if(CTRL_LEFT(state) | CTRL_LSTICK_LEFT(state))
{
for(uint32_t i = 0; i < (SNES_DEVICE_ID_MAX_JOYPAD_BUTTON+1) && !found_keybind; i++)
for(uint32_t i = 0; i < SSNES_FIRST_META_KEY && !found_keybind; i++)
{
if(g_settings.input.binds[currently_selected_controller_menu][i].joykey == system_joypad_id)
{
@ -1051,13 +1051,13 @@ static void set_keybind_digital(uint64_t state, uint32_t system_joypad_id, uint3
if(CTRL_RIGHT(state) || CTRL_LSTICK_RIGHT(state) || CTRL_CROSS(state))
{
for(uint32_t i = 0; i < (SNES_DEVICE_ID_MAX_JOYPAD_BUTTON+1) && !found_keybind; i++)
for(uint32_t i = 0; i < SSNES_FIRST_META_KEY && !found_keybind; i++)
{
if(g_settings.input.binds[currently_selected_controller_menu][i].joykey == system_joypad_id)
{
found_keybind = true;
if(g_settings.input.binds[currently_selected_controller_menu][i].id < SNES_DEVICE_ID_MAX_JOYPAD_BUTTON)
if(g_settings.input.binds[currently_selected_controller_menu][i].id < SSNES_FIRST_META_KEY - 1)
g_settings.input.binds[currently_selected_controller_menu][i].id++;
}
}