From a40c507aa1f2eea7302b669ee9d37f038866d49a Mon Sep 17 00:00:00 2001 From: Valiantsin Dzerakh Date: Sun, 1 Nov 2026 12:36:10 +0300 Subject: [PATCH] Name the stick dead zone notes stick_note, apart from the prompts note in the same function The per-stick rows of #175 declared a second `note` in tab_controls, beside the button prompts note dev added there, and runtime/ui/menu.cpp did not compile. Co-Authored-By: Claude Opus 5.5 --- runtime/ui/menu.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/runtime/ui/menu.cpp b/runtime/ui/menu.cpp index e5784418..f65aa3ef 100644 --- a/runtime/ui/menu.cpp +++ b/runtime/ui/menu.cpp @@ -819,12 +819,13 @@ static void tab_controls(float scale) { // row shows its stick's deflection now, before the dead zone: a drifting stick's resting value, to set it above. double now[2]; bool pad = input_pad_stick_percent(now) != 0; - char note[2][64]; - for (int s = 0; s < 2; s++) snprintf(note[s], sizeof note[s], menu_text(UI_MENU_STICK_DEADZONE_NOW), now[s]); + char stick_note[2][64]; + for (int s = 0; s < 2; s++) + snprintf(stick_note[s], sizeof stick_note[s], menu_text(UI_MENU_STICK_DEADZONE_NOW), now[s]); opt_slider("TOTK_LSTICK_DEADZONE", UI_MENU_LSTICK_DEADZONE, 0, 50, UI_MENU_STICK_DEADZONE_DESC, 1, "%.0f %%", - pad ? note[0] : nullptr, "TOTK_STICK_DEADZONE"); + pad ? stick_note[0] : nullptr, "TOTK_STICK_DEADZONE"); opt_slider("TOTK_RSTICK_DEADZONE", UI_MENU_RSTICK_DEADZONE, 0, 50, UI_MENU_STICK_DEADZONE_DESC, 1, "%.0f %%", - pad ? note[1] : nullptr, "TOTK_STICK_DEADZONE"); + pad ? stick_note[1] : nullptr, "TOTK_STICK_DEADZONE"); opt_slider("TOTK_STICK_SENS", UI_MENU_STICK_SENS, 0.1f, 3, UI_MENU_STICK_SENS_DESC, 0.05f, "%.2f"); opt_slider("TOTK_MOUSE_SENS", UI_MENU_MOUSE_SENS, 0, 10, UI_MENU_MOUSE_SENS_DESC, 0.1f, "%.1f"); row_walk_key();