From c00adf8d3ae362483778de78ddc59d464b315a63 Mon Sep 17 00:00:00 2001 From: Mike Pavone Date: Sun, 30 Dec 2018 23:21:59 -0800 Subject: Fix binding UI for "6 button right" style controllers --- nuklear_ui/blastem_nuklear.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nuklear_ui/blastem_nuklear.c') diff --git a/nuklear_ui/blastem_nuklear.c b/nuklear_ui/blastem_nuklear.c index 29dd79c..86d711c 100644 --- a/nuklear_ui/blastem_nuklear.c +++ b/nuklear_ui/blastem_nuklear.c @@ -1056,7 +1056,7 @@ void view_controller_bindings(struct nk_context *context) selected_controller_info.variant == VARIANT_6B_BUMPERS ? 1 : 2, (int[]){ selected_controller_info.variant == VARIANT_6B_RIGHT ? SDL_CONTROLLER_BUTTON_LEFTSHOULDER : SDL_CONTROLLER_BUTTON_RIGHTSHOULDER, - selected_controller_info.variant == VARIANT_6B_RIGHT ? SDL_CONTROLLER_BUTTON_RIGHTSHOULDER : AXIS | SDL_CONTROLLER_AXIS_TRIGGERRIGHT + AXIS | SDL_CONTROLLER_AXIS_TRIGGERLEFT }); binding_box(context, bindings, "Misc Buttons", (render_width() - bind_box_width) / 2, font->height/2, bind_box_width, 3, (int[]){ @@ -1098,7 +1098,7 @@ void view_controller_bindings(struct nk_context *context) selected_controller_info.variant == VARIANT_6B_BUMPERS ? 1 : 2, (int[]){ selected_controller_info.variant == VARIANT_6B_RIGHT ? SDL_CONTROLLER_BUTTON_LEFTSTICK : SDL_CONTROLLER_BUTTON_LEFTSHOULDER, - selected_controller_info.variant == VARIANT_6B_RIGHT ? SDL_CONTROLLER_BUTTON_RIGHTSTICK : AXIS | SDL_CONTROLLER_AXIS_TRIGGERLEFT + SDL_CONTROLLER_BUTTON_RIGHTSTICK }); binding_box(context, bindings, "D-pad", dpad_left, dpad_top, bind_box_width, 4, (int[]){ -- cgit v1.2.3