fix merge conflicts

This commit is contained in:
alufolie91 committed 2023-11-10 16:22:49 +01:00
1 parent f29240f3e8
commit d427cd60b2
1 file changed
+15 -10
+15 -10
View File
@@ -1728,18 +1728,19 @@ static menuitem_t OP_SaturnMenu[] =
{IT_STRING | IT_CVAR, NULL, "Skin Select Spinning Speed", &cv_skinselectspin, 20},
{IT_STRING | IT_CVAR, NULL, "Input Display outside of RA", &cv_showinput, 25},
{IT_STRING | IT_CVAR, NULL, "Small Speedometer", &cv_newspeedometer, 30},
{IT_STRING | IT_CVAR, NULL, "Colourized HUD", &cv_colorizedhud, 35},
{IT_STRING | IT_CVAR, NULL, "Colourized Itembox", &cv_colorizeditembox, 40},
{IT_STRING | IT_CVAR, NULL, "Colourized HUD Color", &cv_colorizedhudcolor, 45},
{IT_STRING | IT_CVAR, NULL, "Show Lap Emblem", &cv_showlapemblem, 50},
{IT_STRING | IT_CVAR, NULL, "Show Minimap Names", &cv_showminimapnames, 55},
{IT_STRING | IT_CVAR, NULL, "Small Minimap Players", &cv_minihead, 60},
{IT_STRING | IT_CVAR, NULL, "Less Midnight Channel Flicker", &cv_lessflicker, 65},
{IT_STRING | IT_CVAR, NULL, "Stat Display", &cv_showstats, 35},
{IT_STRING | IT_CVAR, NULL, "Colourized HUD", &cv_colorizedhud, 40},
{IT_STRING | IT_CVAR, NULL, "Colourized Itembox", &cv_colorizeditembox, 45},
{IT_STRING | IT_CVAR, NULL, "Colourized HUD Color", &cv_colorizedhudcolor, 50},
{IT_STRING | IT_CVAR, NULL, "Show Lap Emblem", &cv_showlapemblem, 55},
{IT_STRING | IT_CVAR, NULL, "Show Minimap Names", &cv_showminimapnames, 60},
{IT_STRING | IT_CVAR, NULL, "Small Minimap Players", &cv_minihead, 65},
{IT_STRING | IT_CVAR, NULL, "Less Midnight Channel Flicker", &cv_lessflicker, 70},
{IT_SUBMENU|IT_STRING, NULL, "Player distortion...", &OP_PlayerDistortDef, 75},
{IT_SUBMENU|IT_STRING, NULL, "Hud Offsets...", &OP_HudOffsetDef, 80},
{IT_SUBMENU|IT_STRING, NULL, "Player distortion...", &OP_PlayerDistortDef, 80},
{IT_SUBMENU|IT_STRING, NULL, "Hud Offsets...", &OP_HudOffsetDef, 85},
{IT_SUBMENU|IT_STRING, NULL, "Saturn Credits", &OP_SaturnCreditsDef, 90}, // uwu
{IT_SUBMENU|IT_STRING, NULL, "Saturn Credits", &OP_SaturnCreditsDef, 95}, // uwu
};
static const char* OP_SaturnTooltips[] =
@@ -1839,6 +1840,10 @@ static menuitem_t OP_HudOffsetMenu[] =
{IT_HEADER, NULL, "Position / R.A. Wheel", NULL, 130},
{IT_STRING | IT_CVAR, NULL, "Horizontal Offset", &cv_posi_xoffset, 135},
{IT_STRING | IT_CVAR, NULL, "Vertical Offset", &cv_posi_yoffset, 140},
{IT_HEADER, NULL, "Stat Display", NULL, 150},
{IT_STRING | IT_CVAR, NULL, "Horizontal Offset", &cv_stat_xoffset, 155},
{IT_STRING | IT_CVAR, NULL, "Vertical Offset", &cv_stat_yoffset, 160},
};
static menuitem_t OP_SaturnCreditsMenu[] =