From eee6e4e020416841e35bcd3377fefa66a0ce129e Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 8 Jan 2025 05:04:54 +0100 Subject: [PATCH] driftcharge toggle + menu entry --- src/k_kart.c | 2 +- src/k_kart.h | 8 +++----- src/m_menu.c | 18 +++++++++++------- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index 2cf3b67cb..1f03c7e23 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -116,7 +116,7 @@ IMPL_HUD_OFFSET(stat); // Stats #undef IMPL_HUD_OFFSET_X #undef IMPL_HUD_OFFSET_Y -static CV_PossibleValue_t colorspeedlines_cons_t[] = {{0, "Off"}, {1, "Normal"}, {2, "Driftcharge"}, {0, NULL}}; +static CV_PossibleValue_t colorspeedlines_cons_t[] = {{0, "Off"}, {1, "Normal"}, {2, "+Driftcharge"}, {0, NULL}}; consvar_t cv_coloredspeedlines = {"colorizedspeedlines", "Off", CV_SAVE, colorspeedlines_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; //extra hud things diff --git a/src/k_kart.h b/src/k_kart.h index 09fe6d906..b5e901713 100644 --- a/src/k_kart.h +++ b/src/k_kart.h @@ -24,14 +24,12 @@ boolean K_UseColorHud(void); void K_RegisterKartStuff(void); -extern consvar_t cv_colorizedhud; -extern consvar_t cv_colorizeditembox; -extern consvar_t cv_colorizedhudcolor; +extern consvar_t cv_coloredspeedlines; +extern consvar_t cv_colorizedhud, cv_colorizeditembox, cv_colorizedhudcolor; extern consvar_t cv_darkitembox; extern consvar_t cv_biglaps; extern consvar_t cv_highresportrait; -extern consvar_t cv_stat_xoffset; -extern consvar_t cv_stat_yoffset; +extern consvar_t cv_stat_xoffset, cv_stat_yoffset; extern consvar_t cv_showstats; extern consvar_t cv_showlaptimes; extern consvar_t cv_battlespeedo; diff --git a/src/m_menu.c b/src/m_menu.c index 3d9669156..807648bf5 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -2194,16 +2194,18 @@ static menuitem_t OP_SaturnMenu[] = {IT_STRING | IT_CVAR, NULL, "Skin Select Spinning Speed", &cv_skinselectspin, 20}, - {IT_STRING | IT_CVAR, NULL, "Show Localskin Menus", &cv_showlocalskinmenus, 30}, - {IT_STRING | IT_CVAR, NULL, "Uppercase Menu", &cv_menucaps, 35}, + {IT_STRING | IT_CVAR, NULL, "Colourized Speedlines", &cv_coloredspeedlines, 30}, - {IT_STRING | IT_CVAR, NULL, "Keyboard Layout", &cv_keyboardlayout, 45}, + {IT_STRING | IT_CVAR, NULL, "Show Localskin Menus", &cv_showlocalskinmenus, 40}, + {IT_STRING | IT_CVAR, NULL, "Uppercase Menu", &cv_menucaps, 45}, - {IT_STRING | IT_CVAR, NULL, "Less Midnight Channel Flicker", &cv_lessflicker, 55}, + {IT_STRING | IT_CVAR, NULL, "Keyboard Layout", &cv_keyboardlayout, 55}, - {IT_SUBMENU|IT_STRING, NULL, "Saturn Hud...", &OP_SaturnHudDef, 65}, - {IT_SUBMENU|IT_STRING, NULL, "Sprite Distortion...", &OP_PlayerDistortDef, 70}, - {IT_SUBMENU|IT_STRING, NULL, "Saturn Credits", &OP_SaturnCreditsDef, 80}, // uwu + {IT_STRING | IT_CVAR, NULL, "Less Midnight Channel Flicker", &cv_lessflicker, 65}, + + {IT_SUBMENU|IT_STRING, NULL, "Saturn Hud...", &OP_SaturnHudDef, 75}, + {IT_SUBMENU|IT_STRING, NULL, "Sprite Distortion...", &OP_PlayerDistortDef, 80}, + {IT_SUBMENU|IT_STRING, NULL, "Saturn Credits", &OP_SaturnCreditsDef, 90}, // uwu }; static const char* OP_SaturnTooltips[] = @@ -2211,6 +2213,7 @@ static const char* OP_SaturnTooltips[] = NULL, "How long can the game wait before it kicks you out from the server\nconnecting screen.", "How much speen do you want?", + "Colourize the speedlines in your skincolor if you go fast enough!", "Show Localskin Menus.", "Force menu to only use uppercase.", "Use your desired Keyboard Layout for Text Input\nthis is either the Default, Native or Azerty\nNative does not affect Gameplay only Text!", @@ -2225,6 +2228,7 @@ enum sm_header, sm_waittime, sm_skinselspeed, + sm_colorlines, sm_showlocalskin, op_uppercase_menu, sm_nativkey,