input: unbind old keys when new one is bound

git-svn-id: file:///home/notaz/opt/svn/PicoDrive@887 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz 2010-09-06 19:31:23 +00:00
parent 739e1043a0
commit 7090b78416

View file

@ -1359,11 +1359,13 @@ static void key_config_loop(const me_bind_action *opts, int opt_cnt, int player_
break; break;
} }
continue; continue;
case PBTN_MBACK: return; case PBTN_MBACK:
return;
case PBTN_MOK: case PBTN_MOK:
if (sel >= opt_cnt) if (sel >= opt_cnt)
return; return;
while (in_menu_wait_any(30) & PBTN_MOK); while (in_menu_wait_any(30) & PBTN_MOK)
;
break; break;
case PBTN_MA2: case PBTN_MA2:
in_unbind_all(dev_id, opts[sel].mask << mask_shift, bindtype); in_unbind_all(dev_id, opts[sel].mask << mask_shift, bindtype);
@ -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)) in_get_dev_info(dev_id, IN_INFO_DOES_COMBOS))
unbind = 0; unbind = 0;
in_bind_key(dev_id, kc, opts[sel].mask << mask_shift, bindtype, unbind); if (unbind)
in_unbind_all(dev_id, opts[sel].mask << mask_shift, bindtype);
in_bind_key(dev_id, kc, opts[sel].mask << mask_shift, bindtype, 0);
} }
} }