RaySollium99/picodrive
1
0
Fork 0
mirror of https://github.com/RaySollium99/picodrive.git synced 2025-09-05 15:27:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

key combos for new input code

Browse source 
git-svn-id: file:///home/notaz/opt/svn/PicoDrive@690 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz 2009-05-11 20:58:55 +00:00
parent cc33f567ae
commit 9025b93159
13 changed files with 129 additions and 165 deletions
Download patch file Download diff file Expand all files Collapse all files

11
platform/common/menu.c
View file

@ -1055,7 +1055,7 @@ static char *action_binds(int player_idx, int action_mask, int dev_id)
if (binds == NULL)
return static_buff;
count = in_get_dev_bind_count(dev_id);
count = in_get_dev_info(dev_id, IN_INFO_BIND_COUNT);
for (k = 0; k < count; k++)
{
const char *xname;
@ -1088,7 +1088,7 @@ static int count_bound_keys(int dev_id, int action_mask, int player_idx)
if (binds == NULL)
return 0;
count = in_get_dev_bind_count(dev_id);
count = in_get_dev_info(dev_id, IN_INFO_BIND_COUNT);
for (k = 0; k < count; k++)
{
if (!(binds[k] & action_mask))
@ -1206,7 +1206,12 @@ static void key_config_loop(const me_bind_action *opts, int opt_cnt, int player_
for (is_down = 1; is_down; )
kc = in_update_keycode(&dev_id, &is_down, -1);
unbind = count_bound_keys(dev_id, opts[sel].mask, player_idx) >= 2;
i = count_bound_keys(dev_id, opts[sel].mask, player_idx);
unbind = (i > 0);
/* allow combos if device supports them */
if (i == 1 && in_get_dev_info(dev_id, IN_INFO_DOES_COMBOS))
unbind = 0;
in_bind_key(dev_id, kc, opts[sel].mask, unbind);
if (player_idx >= 0) {