Settings.JoyBinds[u][i] &= ~action;\r
}\r
\r
-static int count_bound_keys(int action, int is_joy)\r
+static int count_bound_keys(int action, int joy)\r
{\r
- int i, u, keys = 0;\r
+ int i, keys = 0;\r
\r
- if (is_joy)\r
+ if (joy)\r
{\r
- for (u = 0; u < 4; u++)\r
- for (i = 0; i < 32; i++)\r
- if (Settings.JoyBinds[u][i] & action) keys++;\r
+ for (i = 0; i < 32; i++)\r
+ if (Settings.JoyBinds[joy-1][i] & action) keys++;\r
}\r
else\r
{\r
{\r
for (i = 0; i < 32; i++)\r
if (inp & (1 << i)) {\r
- if (count_bound_keys(opts[sel].mask, 1) >= 1) // disallow combos for usbjoy\r
+ if (count_bound_keys(opts[sel].mask, joy) >= 1) // disallow combos for usbjoy\r
Settings.JoyBinds[joy-1][i] &= ~opts[sel].mask;\r
else Settings.JoyBinds[joy-1][i] ^= opts[sel].mask;\r
if (player_idx >= 0) {\r