From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sun, 22 Jul 2012 00:50:49 +0000 (+0000)
Subject: don't double-apply slowmo when playing back non-darkplaces demos (this
X-Git-Tag: xonotic-v0.7.0~120
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8abd6f4fe8e730bf004677a2dc97110a12e04cde;p=xonotic%2Fdarkplaces.git

don't double-apply slowmo when playing back non-darkplaces demos (this
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
---

diff --git a/cl_input.c b/cl_input.c
index 94c7ef3b..a750e68b 100644
--- a/cl_input.c
+++ b/cl_input.c
@@ -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;