From: havoc Date: Sat, 21 Jul 2012 22:27:19 +0000 (+0000) Subject: don't honor cl.paused or host_framerate in demo playback (to fix Malice X-Git-Tag: xonotic-v0.7.0~121 X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=fc61304c1debdb7a4e3c9417a3f8a987d8d71a7d;p=xonotic%2Fdarkplaces.git don't honor cl.paused or host_framerate in demo playback (to fix Malice intro demos which otherwise get paused and stay there) git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11833 d7cf8633-e32d-0410-b094-e92efae38249 ::stable-branch::merge=29d6f023ba9ed6a6660aeb574ea384a07c38e9c9 --- diff --git a/host.c b/host.c index 72ed8b98..7bc799dd 100644 --- a/host.c +++ b/host.c @@ -961,13 +961,15 @@ void Host_Main(void) if (cls.demopaused) clframetime = 0; } + else + { + // host_framerate overrides all else + if (host_framerate.value) + clframetime = host_framerate.value; - // host_framerate overrides all else - if (host_framerate.value) - clframetime = host_framerate.value; - - if (cl.paused || (cl.islocalgame && (key_dest != key_game || key_consoleactive || cl.csqc_paused))) - clframetime = 0; + if (cl.paused || (cl.islocalgame && (key_dest != key_game || key_consoleactive || cl.csqc_paused))) + clframetime = 0; + } if (cls.timedemo) clframetime = cl.realframetime = cl_timer;