X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=cl_input.c;h=9b70e21e933c3e921c4534091a79a27fdd19cc8c;hb=528b92ffab3a9ab09770310e2796adbe5f0f1e20;hp=abe87409f180b2f771a2fe9c7f6a117d1046b76d;hpb=ffaccd845a9f7eae918e4f1bcb178d34c6324bf9;p=xonotic%2Fdarkplaces.git

diff --git a/cl_input.c b/cl_input.c
index abe87409..9b70e21e 100644
--- a/cl_input.c
+++ b/cl_input.c
@@ -1338,6 +1338,7 @@ void CL_UpdateMoveVars(void)
 	}
 	else if (cl.stats[STAT_MOVEVARS_TICRATE])
 	{
+		cl.movevars_ticrate = cl.statsf[STAT_MOVEVARS_TICRATE];
 		cl.movevars_timescale = cl.statsf[STAT_MOVEVARS_TIMESCALE];
 		cl.movevars_gravity = cl.statsf[STAT_MOVEVARS_GRAVITY];
 		cl.movevars_stopspeed = cl.statsf[STAT_MOVEVARS_STOPSPEED] ;
@@ -1368,6 +1369,7 @@ void CL_UpdateMoveVars(void)
 	}
 	else
 	{
+		cl.movevars_ticrate = slowmo.value / bound(1.0f, cl_netfps.value, 1000.0f);
 		cl.movevars_timescale = slowmo.value;
 		cl.movevars_gravity = sv_gravity.value;
 		cl.movevars_stopspeed = cl_movement_stopspeed.value;
@@ -1655,6 +1657,11 @@ void CL_SendMove(void)
 	// don't send too often or else network connections can get clogged by a
 	// high renderer framerate
 	packettime = 1.0 / bound(1, cl_netfps.value, 1000);
+	if (cl.movevars_timescale && cl.movevars_ticrate)
+	{
+		float maxtic = cl.movevars_ticrate / cl.movevars_timescale;
+		packettime = min(packettime, maxtic);
+	}
 	// send input every frame in singleplayer
 	if (cl.islocalgame)
 		packettime = 0;