fixeur conflicts i was too lazy too fix lol

This commit is contained in:
Alug committed 2024-02-24 15:35:49 +01:00
1 parent d10fb3fb6a
commit c9cafeefe7
1 file changed
+1 -5
+1 -5
View File
@@ -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--;
}