From 595d078a83f421588f1fe87f24f0e6b6c0578682 Mon Sep 17 00:00:00 2001 From: James R Date: Tue, 26 Dec 2023 18:53:13 -0800 Subject: [PATCH] Menu: move mindelay option to Profiles/Accessibility --- src/menus/options-gameplay-1.c | 6 ------ .../options-profiles-edit-accessibility.cpp | 18 +++++++++++++++--- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/menus/options-gameplay-1.c b/src/menus/options-gameplay-1.c index 74217467e..e8f3a8a5d 100644 --- a/src/menus/options-gameplay-1.c +++ b/src/menus/options-gameplay-1.c @@ -30,12 +30,6 @@ menuitem_t OPTIONS_Gameplay[] = {IT_STRING | IT_CVAR, "Starting Bumpers", "Change how many bumpers player start with in Battle.", NULL, {.cvar = &cv_kartbumpers}, 0, 0}, - {IT_SPACE | IT_NOTHING, NULL, NULL, - NULL, {NULL}, 0, 0}, - - {IT_STRING | IT_CVAR, "Minimum Input Delay", "Practice for online play! Higher = more delay, 0 = instant response.", - NULL, {.cvar = &cv_mindelay}, 0, 0}, - {IT_SPACE | IT_NOTHING, NULL, NULL, NULL, {NULL}, 0, 0}, diff --git a/src/menus/options-profiles-edit-accessibility.cpp b/src/menus/options-profiles-edit-accessibility.cpp index 686949302..9588de67e 100644 --- a/src/menus/options-profiles-edit-accessibility.cpp +++ b/src/menus/options-profiles-edit-accessibility.cpp @@ -3,8 +3,11 @@ #include "../v_draw.hpp" +#include "../command.h" #include "../k_menu.h" +extern "C" consvar_t cv_mindelay; + using srb2::Draw; namespace @@ -57,14 +60,23 @@ menuitem_t OPTIONS_ProfileAccessibility[] = { {IT_STRING | IT_CVAR, "Rumble", "For gamepad users - should your device rumble?", NULL, {.cvar = &cv_dummyprofilerumble}, 0, 0}, - {IT_STRING | IT_CVAR, "Kickstart Accel", "Hold A to auto-accel. Tap it to cancel.", - NULL, {.cvar = &cv_dummyprofilekickstart}, 0, 0}, + {IT_SPACE | IT_NOTHING, NULL, NULL, + NULL, {NULL}, 0, 0}, {IT_STRING | IT_CVAR, "Auto Roulette", "Item roulette auto-stops on a random result.", NULL, {.cvar = &cv_dummyprofileautoroulette}, 0, 0}, + {IT_STRING | IT_CVAR, "Kickstart Accel", "Hold A to auto-accel. Tap it to cancel.", + NULL, {.cvar = &cv_dummyprofilekickstart}, 0, 0}, + {IT_STRING | IT_CVAR, "Lite Steer", "Hold DOWN on d-pad/keyboard for shallow turns.", NULL, {.cvar = &cv_dummyprofilelitesteer}, 0, 0}, + + {IT_SPACE | IT_NOTHING, NULL, NULL, + NULL, {NULL}, 0, 0}, + + {IT_STRING | IT_CVAR, "Minimum Input Delay", "Practice for online play! 0 = instant response.", + NULL, {.cvar = &cv_mindelay}, 0, 0}, }; menu_t OPTIONS_ProfileAccessibilityDef = { @@ -72,7 +84,7 @@ menu_t OPTIONS_ProfileAccessibilityDef = { &OPTIONS_EditProfileDef, 0, OPTIONS_ProfileAccessibility, - 145, 80, + 145, 72, SKINCOLOR_ULTRAMARINE, 0, MBF_DRAWBGWHILEPLAYING, "FILE",