Merge remote-tracking branch 'nullworks/newui'

This commit is contained in:
TotallyNotElite 2018-08-03 13:47:37 +02:00
commit 432db2465a

View File

@ -306,7 +306,7 @@ float getLatency()
int getTicks()
{
return max(min(*latency / 15 + getTicks2() == 24 ? 12 : 0, 65), 12);
return max(min(*latency / 15, 65), 12);
}
int getTicks2()