Mercurial > repos > blastem
diff io.c @ 499:27345a67225d
Merge
author | Mike Pavone <pavone@retrodev.com> |
---|---|
date | Tue, 29 Oct 2013 00:03:11 -0700 |
parents | 36c080ece4ed |
children | 7b0df1aaf384 |
line wrap: on
line diff
--- a/io.c Mon Oct 28 23:59:59 2013 -0700 +++ b/io.c Tue Oct 29 00:03:11 2013 -0700 @@ -147,6 +147,16 @@ bind_key(keycode, BIND_UI, action, 0, param); } +void bind_button_ui(int joystick, int joybutton, ui_action action, uint8_t param) +{ + bind_button(joystick, joybutton, BIND_UI, action, 0, param); +} + +void bind_dpad_ui(int joystick, int dpad, uint8_t direction, ui_action action, uint8_t param) +{ + bind_dpad(joystick, dpad, direction, BIND_UI, action, 0, param); +} + void handle_binding_down(keybinding * binding) { switch(binding->bind_type) @@ -487,8 +497,9 @@ int bindtype = parse_binding_target(target, padbuttons, &ui_func, &padnum, &button); if (bindtype == 1) { bind_dpad_gamepad(i, dpad, dirnums[dir], padnum, button); + } else if (bindtype == 2) { + bind_dpad_ui(i, dpad, dirnums[dir], ui_func, button); } - //TODO: Handle UI bindings } } } @@ -508,8 +519,9 @@ int bindtype = parse_binding_target(target, padbuttons, &ui_func, &padnum, &button); if (bindtype == 1) { bind_button_gamepad(i, but, padnum, button); + } else if (bindtype == 2) { + bind_button_ui(i, but, ui_func, button); } - //TODO: Handle UI bindings } } }