Merge branch 'statusbar-stuff' into 'master'

No longer allow showhud to toggle FPS counter or ping bar

See merge request STJr/SRB2Internal!523
This commit is contained in:
MascaraSnake 2019-11-23 18:09:59 -05:00
commit df50900ac5

View file

@ -1176,14 +1176,11 @@ void I_FinishUpdate(void)
if (cv_closedcaptioning.value) if (cv_closedcaptioning.value)
SCR_ClosedCaptions(); SCR_ClosedCaptions();
if (st_overlay) if (cv_ticrate.value)
{ SCR_DisplayTicRate();
if (cv_ticrate.value)
SCR_DisplayTicRate();
if (cv_showping.value && netgame && consoleplayer != serverplayer) if (cv_showping.value && netgame && consoleplayer != serverplayer)
SCR_DisplayLocalPing(); SCR_DisplayLocalPing();
}
if (rendermode == render_soft && screens[0]) if (rendermode == render_soft && screens[0])
{ {