diff --git a/src/d_netcmd.c b/src/d_netcmd.c index f8c84b913..37f96ad78 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -469,6 +469,8 @@ consvar_t cv_showping = {"showping", "Always", CV_SAVE, showping_cons_t, NULL, 0 static CV_PossibleValue_t pingmeasurement_cons_t[] = {{0, "Frames"}, {1, "Milliseconds"}, {0, NULL}}; consvar_t cv_pingmeasurement = {"pingmeasurement", "Frames", CV_SAVE, pingmeasurement_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_showlapemblem = {"showlapemblem", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; + consvar_t cv_showviewpointtext = {"showviewpointtext", "On", CV_SAVE, CV_OnOff, 0, 0, NULL, NULL, 0, 0, NULL}; // Intermission time Tails 04-19-2002 @@ -770,6 +772,8 @@ void D_RegisterServerCommands(void) CV_RegisterVar(&cv_pingtimeout); CV_RegisterVar(&cv_showping); CV_RegisterVar(&cv_pingmeasurement); + + CV_RegisterVar(&cv_showlapemblem); CV_RegisterVar(&cv_showtrackaddon); diff --git a/src/d_netcmd.h b/src/d_netcmd.h index e92289397..b201d8639 100644 --- a/src/d_netcmd.h +++ b/src/d_netcmd.h @@ -150,6 +150,8 @@ extern consvar_t cv_pingtimeout; extern consvar_t cv_showping; extern consvar_t cv_pingmeasurement; +extern consvar_t cv_showlapemblem; + extern consvar_t cv_showviewpointtext; extern consvar_t cv_skipmapcheck; diff --git a/src/k_kart.c b/src/k_kart.c index 4968ad3e4..7e79cd9f6 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -9244,6 +9244,9 @@ static void K_drawChallengerScreen(void) static void K_drawLapStartAnim(void) { + if (! cv_showlapemblem.value) + return; + // This is an EVEN MORE insanely complicated animation. const UINT8 progress = 80-stplyr->kartstuff[k_lapanimation]; UINT8 *colormap = R_GetTranslationColormap(TC_DEFAULT, stplyr->skincolor, GTC_CACHE); diff --git a/src/m_menu.c b/src/m_menu.c index 97b043da1..88964e75b 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -1696,14 +1696,15 @@ static menuitem_t OP_SaturnMenu[] = {IT_HEADER, NULL, "Saturn Options", NULL, 0}, {IT_STRING | IT_CVAR, NULL, "Serverqueue waittime", &cv_connectawaittime, 20}, //{IT_STRING | IT_CVAR, NULL, "Addon Download Speed", &cv_downloadspeed, 55}, //no idea why you would wanna change it anyways - {IT_STRING | IT_CVAR, NULL, "Skin Select Spinning Speed", &cv_skinselectspin, 40}, - {IT_STRING | IT_CVAR, NULL, "Input Display outside of RA", &cv_showinput, 50}, - {IT_STRING | IT_CVAR, NULL, "V2-ish Speedometer", &cv_newspeedometer, 60}, - {IT_STRING | IT_CVAR, NULL, "No Midnight Channel Flicker", &cv_lessflicker, 70}, - {IT_SUBMENU|IT_STRING, NULL, "Player distortion...", &OP_PlayerDistortDef, 90}, - {IT_SUBMENU|IT_STRING, NULL, "Hud Offsets...", &OP_HudOffsetDef, 100}, + {IT_STRING | IT_CVAR, NULL, "Skin Select Spinning Speed", &cv_skinselectspin, 50}, + {IT_STRING | IT_CVAR, NULL, "Input Display outside of RA", &cv_showinput, 60}, + {IT_STRING | IT_CVAR, NULL, "V2-ish Speedometer", &cv_newspeedometer, 70}, + {IT_STRING | IT_CVAR, NULL, "Show Lap Emblem", &cv_showlapemblem, 80}, + {IT_STRING | IT_CVAR, NULL, "No Midnight Channel Flicker", &cv_lessflicker, 90}, + {IT_SUBMENU|IT_STRING, NULL, "Player distortion...", &OP_PlayerDistortDef, 105}, + {IT_SUBMENU|IT_STRING, NULL, "Hud Offsets...", &OP_HudOffsetDef, 120}, - {IT_SUBMENU|IT_STRING, NULL, "Saturn Credits", &OP_SaturnCreditsDef, 120}, // uwu + {IT_SUBMENU|IT_STRING, NULL, "Saturn Credits", &OP_SaturnCreditsDef, 135}, // uwu }; enum