Merge branch 'master' of https://github.com/rheit/zdoom into zscript

This commit is contained in:
Christoph Oelckers 2016-11-12 09:46:09 +01:00
commit 62a259bb36
8 changed files with 507 additions and 388 deletions

View file

@ -877,8 +877,6 @@ void DFrameBuffer::DrawRateStuff ()
int rate_x;
int textScale = active_con_scale();
if (textScale == 0)
textScale = CleanXfac;
chars = mysnprintf (fpsbuff, countof(fpsbuff), "%2u ms (%3u fps)", howlong, LastCount);
rate_x = Width / textScale - ConFont->StringWidth(&fpsbuff[0]);