Mercurial > repos > blastem

changeset 1664:cc5107def372

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix binding UI for "6 button right" style controllers
author Mike Pavone <pavone@retrodev.com>
date Sun, 30 Dec 2018 23:21:59 -0800
parents f00fec236d56
children 2721949b372d
files nuklear_ui/blastem_nuklear.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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[]){