summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrey Nazarov <skuller@skuller.net>2011-05-26 13:20:01 +0400
committerAndrey Nazarov <skuller@skuller.net>2011-05-26 13:22:43 +0400
commitf5624d2154c1aabc67a45c1e82cd25550df33a14 (patch)
tree077f12dbbdcdfab2c78b8b81fc2e292fe7785723 /src
parent542b6dc12fd54fe8ccafd510891ebeed5a166e49 (diff)
Fix 100% server CPU consumption when built with USE_FPS.
Diffstat (limited to 'src')
-rw-r--r--src/sv_init.c5
-rw-r--r--src/sv_main.c10
2 files changed, 15 insertions, 0 deletions
diff --git a/src/sv_init.c b/src/sv_init.c
index bb1e466..959cdfd 100644
--- a/src/sv_init.c
+++ b/src/sv_init.c
@@ -284,6 +284,11 @@ void SV_InitGame( unsigned mvd_spawn ) {
CM_FreeMap( &sv.cm );
SV_FreeFile( sv.entitystring );
memset( &sv, 0, sizeof( sv ) );
+
+#if USE_FPS
+ // set up default frametime for main loop
+ sv.frametime = BASE_FRAMETIME;
+#endif
}
// get any latched variable changes (maxclients, etc)
diff --git a/src/sv_main.c b/src/sv_main.c
index e944720..9ede239 100644
--- a/src/sv_main.c
+++ b/src/sv_main.c
@@ -1927,6 +1927,11 @@ void SV_Init( void ) {
init_rate_limits();
+#if USE_FPS
+ // set up default frametime for main loop
+ sv.frametime = BASE_FRAMETIME;
+#endif
+
// set up default pmove parameters
PmoveInit( &sv_pmp );
@@ -2040,6 +2045,11 @@ void SV_Shutdown( const char *finalmsg, error_type_t type ) {
// reset rate limits
init_rate_limits();
+#if USE_FPS
+ // set up default frametime for main loop
+ sv.frametime = BASE_FRAMETIME;
+#endif
+
sv_client = NULL;
sv_player = NULL;