r873 - trunk/code/server

[DONOTREPLY at icculus.org]

Author: thilo
Date: 2006-08-26 08:43:38 -0400 (Sat, 26 Aug 2006)
New Revision: 873

Modified:
   trunk/code/server/sv_main.c
Log:
Correctly handle 0 timescale


Modified: trunk/code/server/sv_main.c
===================================================================
--- trunk/code/server/sv_main.c	2006-08-26 06:12:15 UTC (rev 872)
+++ trunk/code/server/sv_main.c	2006-08-26 12:43:38 UTC (rev 873)
@@ -798,7 +798,14 @@
 	if ( sv_fps->integer < 1 ) {
 		Cvar_Set( "sv_fps", "10" );
 	}
+
 	frameMsec = 1000 / sv_fps->integer * com_timescale->value;
+	// don't let it scale below 1ms
+	if(frameMsec < 1)
+	{
+		Cvar_Set("timescale", va("%f", sv_fps->integer / 1000.0f));
+		frameMsec = 1;
+	}
 
 	sv.timeResidual += msec;