scale demo playback speed by slowmo cvar

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@7252 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/cl_input.c b/cl_input.c
index 87ceef1a1a544d162830496a1fe3ac3015bc53c5..2c733896f13ade89f2c17f11370741553f18de3a 100644 (file)
--- a/cl_input.c
+++ b/cl_input.c
@@ -1049,11 +1049,17 @@ extern cvar_t slowmo;
 void CL_UpdateMoveVars(void)
 {
        if (cls.protocol == PROTOCOL_QUAKEWORLD)
+       {
+               cl.movevars_slowmo = 1;
                cl.movevars_ticrate = 1.0 / bound(1, cl_netinputpacketspersecond.value, 100);
+               // scale playback speed of demos by slowmo cvar
+               if (cls.demoplayback)
+                       cl.movevars_slowmo *= slowmo.value;
+       }
        else if (cl.stats[STAT_MOVEVARS_TICRATE])
        {
                cl.movevars_ticrate = cl.statsf[STAT_MOVEVARS_TICRATE];
-               cl.movevars_slowmo = (slowmo.value == 1) ? cl.statsf[STAT_MOVEVARS_TIMESCALE] : slowmo.value;
+               cl.movevars_slowmo = cl.statsf[STAT_MOVEVARS_TIMESCALE];
                cl.movevars_gravity = cl.statsf[STAT_MOVEVARS_GRAVITY];
                cl.movevars_stopspeed = cl.statsf[STAT_MOVEVARS_STOPSPEED] ;
                cl.movevars_maxspeed = cl.statsf[STAT_MOVEVARS_MAXSPEED];
@@ -1068,6 +1074,9 @@ void CL_UpdateMoveVars(void)
                cl.movevars_stepheight = cl.statsf[STAT_MOVEVARS_STEPHEIGHT];
                cl.movevars_airaccel_qw = cl.statsf[STAT_MOVEVARS_AIRACCEL_QW];
                cl.movevars_airaccel_sideways_friction = cl.statsf[STAT_MOVEVARS_AIRACCEL_SIDEWAYS_FRICTION];
+               // scale playback speed of demos by slowmo cvar
+               if (cls.demoplayback)
+                       cl.movevars_slowmo *= slowmo.value;
        }
        else
        {