notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
input: unbind old keys when new one is bound
[picodrive.git]
/
platform
/
common
/
menu.c
diff --git
a/platform/common/menu.c
b/platform/common/menu.c
index
691eda4
..
35ab449
100644
(file)
--- a/
platform/common/menu.c
+++ b/
platform/common/menu.c
@@
-1359,11
+1359,13
@@
static void key_config_loop(const me_bind_action *opts, int opt_cnt, int player_
break;
\r
}
\r
continue;
\r
break;
\r
}
\r
continue;
\r
- case PBTN_MBACK: return;
\r
+ case PBTN_MBACK:
\r
+ return;
\r
case PBTN_MOK:
\r
if (sel >= opt_cnt)
\r
return;
\r
case PBTN_MOK:
\r
if (sel >= opt_cnt)
\r
return;
\r
- while (in_menu_wait_any(30) & PBTN_MOK);
\r
+ while (in_menu_wait_any(30) & PBTN_MOK)
\r
+ ;
\r
break;
\r
case PBTN_MA2:
\r
in_unbind_all(dev_id, opts[sel].mask << mask_shift, bindtype);
\r
break;
\r
case PBTN_MA2:
\r
in_unbind_all(dev_id, opts[sel].mask << mask_shift, bindtype);
\r
@@
-1385,7
+1387,10
@@
static void key_config_loop(const me_bind_action *opts, int opt_cnt, int player_
in_get_dev_info(dev_id, IN_INFO_DOES_COMBOS))
\r
unbind = 0;
\r
\r
in_get_dev_info(dev_id, IN_INFO_DOES_COMBOS))
\r
unbind = 0;
\r
\r
- in_bind_key(dev_id, kc, opts[sel].mask << mask_shift, bindtype, unbind);
\r
+ if (unbind)
\r
+ in_unbind_all(dev_id, opts[sel].mask << mask_shift, bindtype);
\r
+
\r
+ in_bind_key(dev_id, kc, opts[sel].mask << mask_shift, bindtype, 0);
\r
}
\r
}
\r
\r
}
\r
}
\r
\r