Merge remote-tracking branch 'nullworks/newui'

This commit is contained in:
TotallyNotElite 2018-08-02 21:57:38 +02:00
commit 8133a0c6ad

View File

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