{\r
int i;\r
\r
- sel++;\r
for (i = sel + 1; ; i++) {\r
if (i >= len)\r
- i = 1;\r
+ i = 0;\r
if (i == sel)\r
break;\r
\r
break;\r
}\r
\r
- return i - 1;\r
+ return i;\r
}\r
\r
static const char *menu_loop_romsel(char *curr_path, int len,\r
namelist[sel]->d_name);\r
goto rescan;\r
}\r
- if (inp & PBTN_UP ) { sel--; if (sel < 0) sel = n-1; }\r
- if (inp & PBTN_DOWN) { sel++; if (sel > n-1) sel = 0; }\r
- if (inp & PBTN_LEFT) { sel-=10; if (sel < 0) sel = 0; }\r
- if (inp & PBTN_L) { sel-=24; if (sel < 0) sel = 0; }\r
- if (inp & PBTN_RIGHT) { sel+=10; if (sel > n-1) sel = n-1; }\r
- if (inp & PBTN_R) { sel+=24; if (sel > n-1) sel = n-1; }\r
-\r
- if ((inp & PBTN_MOK) || (inp & (PBTN_MENU|PBTN_MA2)) == (PBTN_MENU|PBTN_MA2))\r
+ if (inp & PBTN_UP ) { sel--; if (sel < 0) sel = n-1; }\r
+ else if (inp & PBTN_DOWN) { sel++; if (sel > n-1) sel = 0; }\r
+ else if (inp & PBTN_LEFT) { sel-=10; if (sel < 0) sel = 0; }\r
+ else if (inp & PBTN_RIGHT) { sel+=10; if (sel > n-1) sel = n-1; }\r
+ else if (inp & PBTN_L) { sel-=24; if (sel < 0) sel = 0; }\r
+ else if (inp & PBTN_R) { sel+=24; if (sel > n-1) sel = n-1; }\r
+\r
+ else if ((inp & PBTN_MOK) || (inp & (PBTN_MENU|PBTN_MA2)) == (PBTN_MENU|PBTN_MA2))\r
{\r
if (namelist[sel]->d_type == DT_REG)\r
{\r
if (player_idx >= 0) {\r
can_combo = 0;\r
type = IN_BINDTYPE_PLAYER12 + (player_idx >> 1);\r
+ if (player_idx & 1)\r
+ action_mask <<= 16;\r
}\r
- if (player_idx & 1)\r
- action_mask <<= 16;\r
\r
if (dev_id >= 0)\r
dev = dev_last = dev_id;\r
\r
dev_id = -1; // show all\r
mask_shift = 0;\r
- if (player_idx & 1)\r
- mask_shift = 16;\r
- bindtype = IN_BINDTYPE_EMU;\r
- if (player_idx >= 0)\r
- bindtype = IN_BINDTYPE_PLAYER12 + (player_idx >> 1);\r
+ if (player_idx >= 0) {\r
+ if (player_idx & 1)\r
+ mask_shift = 16;\r
+ bindtype = IN_BINDTYPE_PLAYER12 + (player_idx >> 1);\r
+ } else\r
+ bindtype = IN_BINDTYPE_EMU;\r
\r
for (;;)\r
{\r