Merge branch 'always-show-delay' into 'master'

Always show delay (remove cv_showping)

Closes #1180

See merge request KartKrew/Kart!2153

src/cvars.cpp

@@ -572,9 +572,6 @@ consvar_t cv_serversort = Server("serversort", "Recommended").dont_save().onchan
 	{ 5, "Gametype"},
 });
 
-// show your ping on the HUD next to framerate. Defaults to warning only (shows up if your ping is > maxping)
-consvar_t cv_showping = Server("showping", "Always").values({{0, "Off"}, {1, "Always"}, {2, "Warning"}});
-
 consvar_t cv_showviewpointtext = Server("showviewpointtext", "On").on_off();
 consvar_t cv_skipmapcheck = Server("skipmapcheck", "Off").on_off();
 consvar_t cv_sleep = Server("cpusleep", "1").min_max(0, 1000/TICRATE);

src/d_netcmd.h

@@ -122,8 +122,6 @@ extern consvar_t cv_soundtest;
 
 extern consvar_t cv_maxping;
 extern consvar_t cv_lagless;
-extern consvar_t cv_pingtimeout;
-extern consvar_t cv_showping;
 extern consvar_t cv_pingmeasurement;
 extern consvar_t cv_showviewpointtext;
 

src/i_video_common.cpp

@@ -121,7 +121,7 @@ static void temp_legacy_finishupdate_draws()
 		if (cv_ticrate.value)
 			SCR_DisplayTicRate();
 		
-		if (cv_showping.value && netgame && (consoleplayer != serverplayer || !server_lagless))
+		if (netgame && (consoleplayer != serverplayer || !server_lagless))
 		{
 			if (server_lagless)
 			{

src/k_hud.cpp

@@ -5467,11 +5467,6 @@ K_drawMiniPing (void)
 	UINT32 f = V_SNAPTORIGHT;
 	UINT8 i = R_GetViewNumber();
 
-	if (!cv_showping.value)
-	{
-		return;
-	}
-
 	if (r_splitscreen > 1 && !(i & 1))
 	{
 		f = V_SNAPTOLEFT;

src/menus/options-hud-1.c

@@ -23,9 +23,6 @@ menuitem_t OPTIONS_HUD[] =
 	{IT_STRING | IT_CVAR, "Show FPS", "Displays the framerate in the lower right corner of the screen.",
 		NULL, {.cvar = &cv_ticrate}, 0, 0},
 
-	{IT_STRING | IT_CVAR, "Show Input Delay", "Displays your input delay in the lower right corner of the screen.",
-		NULL, {.cvar = &cv_showping}, 0, 0},
-
 	{IT_STRING | IT_CVAR, "Show \"FOCUS LOST\"", "Displays \"FOCUS LOST\" when the game cannot accept inputs.",
 		NULL, {.cvar = &cv_showfocuslost}, 0, 0},
 

src/screen.c

@@ -579,11 +579,6 @@ void SCR_DisplayLocalPing(void)
 	UINT32 ping = playerpingtable[consoleplayer];
 	UINT32 pl = playerpacketlosstable[consoleplayer];
 
-	if (cv_showping.value == 2 && ping <= servermaxping) // only show 2 (warning) if our ping is at a bad level
-	{
-		return;
-	}
-
 	INT32 dispy = cv_ticrate.value ? 170 : 181;
 	boolean offline = (consoleplayer == serverplayer);
 

src/sdl12/i_video.c

@@ -1326,7 +1326,7 @@ void I_FinishUpdate(void)
 	if (cv_ticrate.value)
 		SCR_DisplayTicRate();
 
-	if (cv_showping.value && netgame && consoleplayer != serverplayer)
+	if (netgame && consoleplayer != serverplayer)
 		SCR_DisplayLocalPing();
 
 	if (render_soft == rendermode && screens[0])

src/st_stuff.c

@@ -491,10 +491,8 @@ void ST_drawDebugInfo(void)
 		height -= 20;
 	}
 
-	if (cv_showping.value)
+	// was cv_showping compensation
-	{
 	height -= 20;
-	}
 
 	if (cht_debug & DBG_BASIC)
 	{

src/win32ce/win_vid.c

@@ -173,7 +173,7 @@ void I_FinishUpdate(void)
 	if (cv_ticrate.value)
 		SCR_DisplayTicRate();
 
-	if (cv_showping.value && netgame && consoleplayer != serverplayer)
+	if (netgame && consoleplayer != serverplayer)
 		SCR_DisplayLocalPing();
 
 	//