diff --git a/src/d_clisrv.c b/src/d_clisrv.c index 4f0e2ab53..0c7e238dd 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -108,6 +108,7 @@ UINT32 playerpingtable[MAXPLAYERS]; //table of player latency values. static tic_t reference_lag; static UINT8 spike_time; tic_t lowest_lag; +tic_t simulated_lag; // just for ping readout without netticbuffer added boolean server_lagless; static void Lagless_OnChange(void) @@ -6697,6 +6698,10 @@ static void UpdatePingTable(void) if (lowest_lag < (tic_t)cv_mindelay.value) lowest_lag = (tic_t)cv_mindelay.value; + simulated_lag = lowest_lag; + + lowest_lag += (tic_t)cv_netticbuffer.value; // account for netticbufffer + pingmeasurecount++; } else // We're a client, handle mindelay on the way out. @@ -6707,9 +6712,13 @@ static void UpdatePingTable(void) tic_t mydelay = playerpingtable[consoleplayer]; if (mydelay < (tic_t)cv_mindelay.value) - lowest_lag = cv_mindelay.value - mydelay; + lowest_lag = ((tic_t)cv_mindelay.value - mydelay); else lowest_lag = 0; + + simulated_lag = lowest_lag; + + lowest_lag += (tic_t)cv_netticbuffer.value; // account for netticbufffer } } diff --git a/src/d_clisrv.h b/src/d_clisrv.h index 2758e8db0..d8a1acc22 100644 --- a/src/d_clisrv.h +++ b/src/d_clisrv.h @@ -586,6 +586,7 @@ extern UINT32 playerpingtable[MAXPLAYERS]; extern tic_t servermaxping; extern boolean server_lagless; +extern tic_t simulated_lag; extern tic_t lowest_lag; extern consvar_t cv_mindelay, cv_lagless; diff --git a/src/hu_stuff.c b/src/hu_stuff.c index dfb66c081..11e304ac5 100644 --- a/src/hu_stuff.c +++ b/src/hu_stuff.c @@ -2403,11 +2403,11 @@ void HU_drawPlayerPing(INT32 x, INT32 y, INT32 pnum, INT32 flags) SINT8 yoffset = 6; UINT32 lag = playerpingtable[pnum]; - const boolean gentleman = ((cv_mindelay.value && (lag < (tic_t)cv_mindelay.value) && P_IsLocalPlayer(&players[pnum])) || (pnum == serverplayer && lowest_lag != 0)); // for serverplayer lowest_lag actually reflects mindelay + const boolean gentleman = (cv_mindelay.value && (lag < (tic_t)simulated_lag)); if (gentleman) { - lag = (pnum == serverplayer) ? lowest_lag : (tic_t)cv_mindelay.value; + lag = simulated_lag; } if (cv_pingstyle.value == 0) // kart @@ -2468,6 +2468,7 @@ void HU_drawPlayerPing(INT32 x, INT32 y, INT32 pnum, INT32 flags) if (gentleman) { barcolor = 194; // make it purplish + // bars get indirectly set earlier } for (i = 0; (i < 3); i++) // Draw the ping bar diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c index 8a5ed8cbc..064bfd25c 100644 --- a/src/sdl/i_video.c +++ b/src/sdl/i_video.c @@ -1440,7 +1440,7 @@ void I_FinishUpdate(void) if (cv_ticrate.value) SCR_DisplayTicRate(); - if (cv_showping.value && ((netgame && consoleplayer != serverplayer) || ((cv_mindelay.value || (!server_lagless && lowest_lag != 0)) && consoleplayer == serverplayer && Playing()))) + if (cv_showping.value && ((netgame && consoleplayer != serverplayer) || (simulated_lag != 0 && consoleplayer == serverplayer && Playing()))) SCR_DisplayLocalPing(); }