From: havoc Date: Mon, 31 Oct 2011 08:35:12 +0000 (+0000) Subject: changed sv_fixedframeratesingleplayer logic a bit (now 10ms to 100ms per X-Git-Tag: xonotic-v0.6.0~199 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a34f74b5cefca14ab45ea6b64a2b467d6b8cc18f;p=xonotic%2Fdarkplaces.git changed sv_fixedframeratesingleplayer logic a bit (now 10ms to 100ms per frame as in original Quake), this cvar is off by default so it should not be a concern git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11499 d7cf8633-e32d-0410-b094-e92efae38249 ::stable-branch::merge=97d471803bf858221b9f83b23622b5f5063ca331 --- diff --git a/host.c b/host.c index 4d27f383..3f70370e 100644 --- a/host.c +++ b/host.c @@ -805,20 +805,15 @@ void Host_Main(void) advancetime = sv_timer; else if (cl.islocalgame && !sv_fixedframeratesingleplayer.integer) { - // synchronize to the client frametime, but no less than 10ms and no more than sys_ticrate - advancetime = bound(0.01, cl_timer, sys_ticrate.value); - framelimit = cl_maxphysicsframesperserverframe.integer; - aborttime = realtime + 0.1; + // synchronize to the client frametime, but no less than 10ms and no more than 100ms + advancetime = bound(0.01, cl_timer, 0.1); } else { advancetime = sys_ticrate.value; // listen servers can run multiple server frames per client frame - if (cls.state == ca_connected) - { - framelimit = cl_maxphysicsframesperserverframe.integer; - aborttime = realtime + 0.1; - } + framelimit = cl_maxphysicsframesperserverframe.integer; + aborttime = realtime + 0.1; } if(slowmo.value > 0 && slowmo.value < 1) advancetime = min(advancetime, 0.1 / slowmo.value);