From c9cafeefe7ffdb565d1d1c38f3f4d44d154158df Mon Sep 17 00:00:00 2001 From: Alug Date: Sat, 24 Feb 2024 15:35:49 +0100 Subject: [PATCH] fixeur conflicts i was too lazy too fix lol --- src/m_menu.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/m_menu.c b/src/m_menu.c index 8344ba502..350f510d6 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -1968,8 +1968,6 @@ static menuitem_t OP_SaturnMenu[] = {IT_STRING | IT_CVAR, NULL, "Show Localskin Menus", &cv_showlocalskinmenus, 85}, {IT_STRING | IT_SUBMENU, NULL, "Nametags...", &OP_NametagDef, 90}, - {IT_STRING | IT_CVAR, NULL, "Native keyboard layout", &cv_nativekeyboard, 95}, - {IT_STRING | IT_CVAR, NULL, "Less Midnight Channel Flicker", &cv_lessflicker, 105}, {IT_SUBMENU|IT_STRING, NULL, "Sprite Distortion...", &OP_PlayerDistortDef, 115}, @@ -1996,7 +1994,6 @@ static const char* OP_SaturnTooltips[] = "Show the big Cecho Messages.", "Show Localskin Menus.", "Nametag Options.", - "Use your native Keyboard Layout.", "Disables the flicker effect on Midnight Channel.", "Options for sprite distortion effects.", "Move position of HUD elements.", @@ -2021,7 +2018,6 @@ enum sm_cechotogle, sm_showlocalskin, sm_nametagmen, - sm_nativkey, sm_pisschannel, sm_distortionmenu, sm_hudoffsets, @@ -5032,7 +5028,7 @@ static void M_DrawGenericMenu(void) { if (!(OP_NametagTooltips[itemOn] == NULL)) { - M_DrawSplitText(BASEVIDWIDTH / 2, BASEVIDHEIGHT-50, V_ALLOWLOWERCASE|V_SNAPTOBOTTOM, OP_NametagTooltips[itemOn], coolalphatimer); + M_DrawSplitText(BASEVIDWIDTH / 2, BASEVIDHEIGHT-50, V_ALLOWLOWERCASE|V_SNAPTOBOTTOM, OP_NametagTooltips[itemOn], 30, coolalphatimer); if (coolalphatimer > 0 && interpTimerHackAllow) coolalphatimer--; }