]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
don't honor cl.paused or host_framerate in demo playback (to fix Malice
authorhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Sat, 21 Jul 2012 22:27:19 +0000 (22:27 +0000)
committerRudolf Polzer <divverent@xonotic.org>
Mon, 23 Jul 2012 15:28:09 +0000 (17:28 +0200)
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

host.c

diff --git a/host.c b/host.c
index 72ed8b9833276176d2a10a9878b5cc5e4594528a..7bc799dd8b37a30a4e4c79e89b301358aec05b9b 100644 (file)
--- 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;