# HG changeset patch # User Mike Pavone # Date 1546240919 28800 # Node ID cc5107def372dd63b5fd50fad6e1c4d2c838114d # Parent f00fec236d56eb196a9bda361526cf802be6cb9a Fix binding UI for "6 button right" style controllers diff -r f00fec236d56 -r cc5107def372 nuklear_ui/blastem_nuklear.c --- a/nuklear_ui/blastem_nuklear.c Sun Dec 30 23:14:00 2018 -0800 +++ b/nuklear_ui/blastem_nuklear.c Sun Dec 30 23:21:59 2018 -0800 @@ -1056,7 +1056,7 @@ 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 @@ 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[]){