notaz.gp2x.de
/
fceu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
usbjoy fix
[fceu.git]
/
drivers
/
gp2x
/
menu.c
diff --git
a/drivers/gp2x/menu.c
b/drivers/gp2x/menu.c
index
5cedc85
..
6abe009
100644
(file)
--- a/
drivers/gp2x/menu.c
+++ b/
drivers/gp2x/menu.c
@@
-731,15
+731,14
@@
static void unbind_action(int action)
Settings.JoyBinds[u][i] &= ~action;
\r
}
\r
\r
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
{
\r
- int i,
u,
keys = 0;
\r
+ int i, keys = 0;
\r
\r
\r
- if (
is_
joy)
\r
+ if (joy)
\r
{
\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
else
\r
{
\r
@@
-824,7
+823,7
@@
static void key_config_loop(const bind_action_t *opts, int opt_cnt, int player_i
{
\r
for (i = 0; i < 32; i++)
\r
if (inp & (1 << i)) {
\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
Settings.JoyBinds[joy-1][i] &= ~opts[sel].mask;
\r
else Settings.JoyBinds[joy-1][i] ^= opts[sel].mask;
\r
if (player_idx >= 0) {
\r