]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
don't double-apply slowmo when playing back non-darkplaces demos (this
authorhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Sun, 22 Jul 2012 00:50:49 +0000 (00:50 +0000)
committerRudolf Polzer <divverent@xonotic.org>
Mon, 23 Jul 2012 15:28:10 +0000 (17:28 +0200)
fixes the bug where if you changed slowmo during a demo to a low value
and back it would often take a long time to reach the next frame before
applying the new value)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11835 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=77e4c84a873c9029ea56a24d532b566fdd7c2573

cl_input.c

index 94c7ef3b07ec2b42a6b8f2db4995cae492b7748e..a750e68b4f9c89269b19f05258d64d684ab7232f 100644 (file)
@@ -1509,8 +1509,8 @@ void CL_UpdateMoveVars(void)
        else
        {
                cl.moveflags = 0;
-               cl.movevars_ticrate = slowmo.value / bound(1.0f, cl_netfps.value, 1000.0f);
-               cl.movevars_timescale = slowmo.value;
+               cl.movevars_ticrate = (cls.demoplayback ? 1.0f : slowmo.value) / bound(1.0f, cl_netfps.value, 1000.0f);
+               cl.movevars_timescale = (cls.demoplayback ? 1.0f : slowmo.value);
                cl.movevars_gravity = sv_gravity.value;
                cl.movevars_stopspeed = cl_movement_stopspeed.value;
                cl.movevars_maxspeed = cl_movement_maxspeed.value;