mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix off-by-one bug.

Browse Source 
Rename "Device No." to Player to clarify a bit.
This commit is contained in:
Themaister 2013-05-04 17:01:10 +02:00
parent 254d9b36d6
commit e3d78af36c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/menu/menu_common.h
View File

@ -155,7 +155,7 @@ typedef enum
RGUI_SETTINGS_RESUME_GAME, RGUI_SETTINGS_RESUME_GAME,
RGUI_SETTINGS_QUIT_RARCH, RGUI_SETTINGS_QUIT_RARCH,
RGUI_SETTINGS_BIND_DEVICE_NO, RGUI_SETTINGS_BIND_PLAYER,
RGUI_SETTINGS_BIND_DEVICE, RGUI_SETTINGS_BIND_DEVICE,
RGUI_SETTINGS_BIND_DEVICE_TYPE, RGUI_SETTINGS_BIND_DEVICE_TYPE,
RGUI_SETTINGS_BIND_DPAD_EMULATION, RGUI_SETTINGS_BIND_DPAD_EMULATION,

10
frontend/menu/rgui.c
View File

@ -606,10 +606,10 @@ static void render_text(rgui_handle_t *rgui)
case RGUI_SETTINGS_CONTROLLER: case RGUI_SETTINGS_CONTROLLER:
strlcpy(type_str, "...", sizeof(type_str)); strlcpy(type_str, "...", sizeof(type_str));
break; break;
case RGUI_SETTINGS_BIND_DEVICE_NO: case RGUI_SETTINGS_BIND_PLAYER:
{ {
char number[10]; char number[10];
snprintf(number, sizeof(number), "%d", port); snprintf(number, sizeof(number), "#%d", port + 1);
strlcpy(type_str, number, sizeof(type_str)); strlcpy(type_str, number, sizeof(type_str));
} }
break; break;
@ -955,7 +955,7 @@ static int rgui_settings_toggle_setting(rgui_handle_t *rgui, unsigned setting, r
} }
break; break;
// controllers // controllers
case RGUI_SETTINGS_BIND_DEVICE_NO: case RGUI_SETTINGS_BIND_PLAYER:
if (action == RGUI_ACTION_START) if (action == RGUI_ACTION_START)
rgui->current_pad = 0; rgui->current_pad = 0;
else if (action == RGUI_ACTION_LEFT) else if (action == RGUI_ACTION_LEFT)
@ -965,7 +965,7 @@ static int rgui_settings_toggle_setting(rgui_handle_t *rgui, unsigned setting, r
} }
else if (action == RGUI_ACTION_RIGHT) else if (action == RGUI_ACTION_RIGHT)
{ {
if (rgui->current_pad < MAX_PLAYERS) if (rgui->current_pad < MAX_PLAYERS - 1)
rgui->current_pad++; rgui->current_pad++;
} }
@ -1609,7 +1609,7 @@ static int shader_manager_toggle_setting(rgui_handle_t *rgui, unsigned setting,
static void rgui_settings_controller_populate_entries(rgui_handle_t *rgui) static void rgui_settings_controller_populate_entries(rgui_handle_t *rgui)
{ {
rgui_list_clear(rgui->selection_buf); rgui_list_clear(rgui->selection_buf);
rgui_list_push(rgui->selection_buf, "Device No", RGUI_SETTINGS_BIND_DEVICE_NO, 0); rgui_list_push(rgui->selection_buf, "Player", RGUI_SETTINGS_BIND_PLAYER, 0);
rgui_list_push(rgui->selection_buf, "Device", RGUI_SETTINGS_BIND_DEVICE, 0); rgui_list_push(rgui->selection_buf, "Device", RGUI_SETTINGS_BIND_DEVICE, 0);
rgui_list_push(rgui->selection_buf, "Device Type", RGUI_SETTINGS_BIND_DEVICE_TYPE, 0); rgui_list_push(rgui->selection_buf, "Device Type", RGUI_SETTINGS_BIND_DEVICE_TYPE, 0);