very very minor optimization

[xonotic/darkplaces.git] / host.c

diff --git a/host.c b/host.c
index 5855a7fd4f1ce6b0f9323f174302c3ef8ac92549..7e281db30c33c3ff9566f6657acf0cdc00ee81c6 100644 (file)
--- a/host.c
+++ b/host.c
@@ -39,7 +39,7 @@ Memory is cleared / released when a server or client begins, not when they end.
 
 // how many frames have occurred
 // (checked by Host_Error and Host_SaveConfig_f)
-int host_framecount;
+int host_framecount = 0;
 // LordHavoc: set when quit is executed
 qboolean host_shuttingdown = false;
 
@@ -51,9 +51,6 @@ double realtime;
 // realtime from previous frame
 double oldrealtime;
 
-// used for -developer commandline parameter, hacky hacky
-int forcedeveloper;
-
 // current client
 client_t *host_client;
 
@@ -82,7 +79,7 @@ cvar_t teamplay = {CVAR_NOTIFY, "teamplay","0", "teamplay mode, values depend on
 cvar_t samelevel = {CVAR_NOTIFY, "samelevel","0", "repeats same level if level ends (due to timelimit or someone hitting an exit)"};
 cvar_t noexit = {CVAR_NOTIFY, "noexit","0", "kills anyone attempting to use an exit"};
 
-cvar_t developer = {0, "developer","100", "prints additional debugging messages and information (recommended for modders and level designers)"};
+cvar_t developer = {0, "developer","0", "prints additional debugging messages and information (recommended for modders and level designers)"};
 cvar_t developer_entityparsing = {0, "developer_entityparsing", "0", "prints detailed network entities information each time a packet is received"};
 
 cvar_t skill = {0, "skill","1", "difficulty level of game, affects monster layouts in levels, 0 = easy, 1 = normal, 2 = hard, 3 = nightmare (same layout as hard but monsters fire twice)"};
@@ -243,8 +240,6 @@ void Host_InitLocal (void)
        Cvar_RegisterVariable (&noexit);
        Cvar_RegisterVariable (&skill);
        Cvar_RegisterVariable (&developer);
-       if (forcedeveloper) // make it real now that the cvar is registered
-               Cvar_SetValue("developer", 100);
        Cvar_RegisterVariable (&developer_entityparsing);
        Cvar_RegisterVariable (&deathmatch);
        Cvar_RegisterVariable (&coop);
@@ -524,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));
-}
-
-
 //============================================================================
 
 /*
@@ -552,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;
@@ -585,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;
        }
@@ -612,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
@@ -679,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)
@@ -917,16 +890,18 @@ void Host_Init (void)
 // COMMANDLINEOPTION: Console: -developer enables warnings and other notices (RECOMMENDED for mod developers)
        if (COM_CheckParm("-developer"))
        {
-               forcedeveloper = true;
                developer.value = developer.integer = 100;
+               developer.string = "100";
        }
 
        if (COM_CheckParm("-developer2"))
        {
-               forcedeveloper = true;
                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