From 28a876b4a408ccb20107d768db76261bd6319ed7 Mon Sep 17 00:00:00 2001 From: WuBoytH Date: Sat, 17 May 2025 02:05:37 -0400 Subject: [PATCH 1/2] fix gcc c stick editing on css --- src/controls/submenu.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/controls/submenu.rs b/src/controls/submenu.rs index 077afdd3de..6c617cd1a7 100644 --- a/src/controls/submenu.rs +++ b/src/controls/submenu.rs @@ -282,8 +282,8 @@ impl TagSubMenu for GamecubeMenu { Self::RIGHT_STICK => Some(Box::new(ButtonSelector { controls_id: self.controls_id, return_to: Box::new(move || Some(Box::new(return_to))), - initial: controls.pro_cstick, - set_input_kind: |ctrls, input| ctrls.pro_cstick = input, + initial: controls.gc_cstick, + set_input_kind: |ctrls, input| ctrls.gc_cstick = input, })), Self::TAP_JUMP => { let mut controls = unsafe { get_ptr_to_controls(self.controls_id) }; From 080145ed37707403589e259e0aa600e2425563db Mon Sep 17 00:00:00 2001 From: WuBoytH Date: Sat, 17 May 2025 02:51:48 -0400 Subject: [PATCH 2/2] Selecting Tilt on Right Stick corrects to Attack --- src/controls/submenu.rs | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/controls/submenu.rs b/src/controls/submenu.rs index 6c617cd1a7..581d7fe076 100644 --- a/src/controls/submenu.rs +++ b/src/controls/submenu.rs @@ -283,7 +283,12 @@ impl TagSubMenu for GamecubeMenu { controls_id: self.controls_id, return_to: Box::new(move || Some(Box::new(return_to))), initial: controls.gc_cstick, - set_input_kind: |ctrls, input| ctrls.gc_cstick = input, + set_input_kind: |ctrls, mut input| { + if input == InputKind::TiltAttack { + input = InputKind::Attack; + } + ctrls.gc_cstick = input + }, })), Self::TAP_JUMP => { let mut controls = unsafe { get_ptr_to_controls(self.controls_id) }; @@ -543,7 +548,12 @@ impl TagSubMenu for ProControllerMenu { controls_id: self.controls_id, return_to: Box::new(move || Some(Box::new(return_to))), initial: controls.pro_cstick, - set_input_kind: |ctrls, input| ctrls.pro_cstick = input, + set_input_kind: |ctrls, mut input| { + if input == InputKind::TiltAttack { + input = InputKind::Attack; + } + ctrls.pro_cstick = input + }, })), Self::TAP_JUMP => { let mut controls = unsafe { get_ptr_to_controls(self.controls_id) };