very very minor optimization

[xonotic/darkplaces.git] / host.c

diff --git a/host.c b/host.c
index a30bf5dfe7a77444aa5da69d92ea1c1adf0c427e..7e281db30c33c3ff9566f6657acf0cdc00ee81c6 100644 (file)
--- a/host.c
+++ b/host.c
@@ -519,25 +519,6 @@ void Host_ShutdownServer(void)
 }
 
 
-/*
-================
-Host_ClearMemory
-
-This clears all the memory used by both the client and server, but does
-not reinitialize anything.
-================
-*/
-void Host_ClearMemory (void)
-{
-       Con_DPrint("Clearing memory\n");
-       Mod_ClearAll ();
-
-       cls.signon = 0;
-       memset (&sv, 0, sizeof(sv));
-       memset (&cl, 0, sizeof(cl));
-}
-
-
 //============================================================================
 
 /*
@@ -547,9 +528,6 @@ Host_FilterTime
 Returns false if the time is too short to run a frame
 ===================
 */
-extern qboolean cl_capturevideo_active;
-extern double cl_capturevideo_framerate;
-extern qfile_t *cl_capturevideo_soundfile;
 qboolean Host_FilterTime (double time)
 {
        double timecap, timeleft;
@@ -580,8 +558,8 @@ qboolean Host_FilterTime (double time)
                timecap = sys_ticrate.value;
        if (cls.state != ca_dedicated)
        {
-               if (cl_capturevideo_active)
-                       timecap = 1.0 / cl_capturevideo_framerate;
+               if (cls.capturevideo_active)
+                       timecap = 1.0 / cls.capturevideo_framerate;
                else if (vid_activewindow)
                        timecap = 1.0 / cl_maxfps.value;
        }
@@ -607,7 +585,7 @@ qboolean Host_FilterTime (double time)
        host_realframetime = host_frametime = realtime - oldrealtime;
        oldrealtime = realtime;
 
-       if (cl_capturevideo_active && !cl_capturevideo_soundfile)
+       if (cls.capturevideo_active && !cls.capturevideo_soundfile)
                host_frametime = timecap;
 
        // apply slowmo scaling
@@ -674,7 +652,7 @@ void Host_ServerFrame (void)
        // setup the VM frame
        SV_VM_Begin();
        // stop running server frames if the wall time reaches this value
-       aborttime = Sys_DoubleTime() + 0.05;
+       aborttime = Sys_DoubleTime() + 0.1;
        for (framecount = 0;framecount < framelimit && sv.timer > 0;framecount++)
        {
                if (sys_ticrate.value <= 0)
@@ -911,13 +889,19 @@ void Host_Init (void)
        // FIXME: this is evil, but possibly temporary
 // COMMANDLINEOPTION: Console: -developer enables warnings and other notices (RECOMMENDED for mod developers)
        if (COM_CheckParm("-developer"))
-               developer.value = developer.integer = 100;developer.string = "100";
+       {
+               developer.value = developer.integer = 100;
+               developer.string = "100";
+       }
 
        if (COM_CheckParm("-developer2"))
        {
-               developer.value = developer.integer = 100;developer.string = "100";
-               developer_memory.value = developer_memory.integer = 100;developer.string = "100";
-               developer_memorydebug.value = developer_memorydebug.integer = 100;developer_memorydebug.string = "100";
+               developer.value = developer.integer = 100;
+               developer.string = "100";
+               developer_memory.value = developer_memory.integer = 100;
+               developer.string = "100";
+               developer_memorydebug.value = developer_memorydebug.integer = 100;
+               developer_memorydebug.string = "100";
        }
 
        // LordHavoc: quake never seeded the random number generator before... heh