]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - host.c
Major update, been neglecting CVS for some time...
[xonotic/darkplaces.git] / host.c
diff --git a/host.c b/host.c
index 3d687b6d0a224a91d335e7e4e07217c2af33d126..2ba18dca9a9c278170398282a23ddf78a12fa17a 100644 (file)
--- a/host.c
+++ b/host.c
@@ -39,7 +39,6 @@ qboolean      hostloopactive = 0;             // LordHavoc: used to turn Host_Error into Sys_Err
 
 double         host_frametime;
 double         host_realframetime;             // LordHavoc: the real frametime, before slowmo and clamping are applied (used for console scrolling)
-double         host_time;
 double         realtime;                               // without any filtering or bounding
 double         oldrealtime;                    // last frame run
 int                    host_framecount;
@@ -120,7 +119,6 @@ This shuts down both the client and server
 ================
 */
 char hosterrorstring[4096];
-extern qboolean hostloopactive;
 void Host_Error (char *error, ...)
 {
        va_list         argptr;
@@ -146,7 +144,7 @@ void Host_Error (char *error, ...)
        }
        inerror = true;
        
-       SCR_EndLoadingPlaque ();                // reenable screen updates
+//     SCR_EndLoadingPlaque ();                // reenable screen updates
 
        va_start (argptr,error);
        vsprintf (hosterrorstring,error,argptr);
@@ -255,8 +253,6 @@ void Host_InitLocal (void)
        Cvar_RegisterVariable (&timeformat);
 
        Host_FindMaxClients ();
-       
-       host_time = 1.0;                // so a think at time 0 won't get called
 }
 
 
@@ -269,13 +265,13 @@ Writes key bindings and archived cvars to config.cfg
 */
 void Host_WriteConfiguration (void)
 {
-       FILE    *f;
+       QFile   *f;
 
 // dedicated servers initialize the host but don't parse and set the
 // config.cfg cvars
        if (host_initialized & !isDedicated)
        {
-               f = fopen (va("%s/config.cfg",com_gamedir), "w");
+               f = Qopen (va("%s/config.cfg",com_gamedir), "w");
                if (!f)
                {
                        Con_Printf ("Couldn't write config.cfg.\n");
@@ -285,7 +281,7 @@ void Host_WriteConfiguration (void)
                Key_WriteBindings (f);
                Cvar_WriteVariables (f);
 
-               fclose (f);
+               Qclose (f);
        }
 }
 
@@ -444,7 +440,7 @@ void Host_ShutdownServer(qboolean crash)
                CL_Disconnect ();
 
 // flush any pending messages - like the score!!!
-       start = Sys_FloatTime();
+       start = Sys_DoubleTime();
        do
        {
                count = 0;
@@ -464,7 +460,7 @@ void Host_ShutdownServer(qboolean crash)
                                }
                        }
                }
-               if ((Sys_FloatTime() - start) > 3.0)
+               if ((Sys_DoubleTime() - start) > 3.0)
                        break;
        }
        while (count);
@@ -520,8 +516,9 @@ Host_FilterTime
 Returns false if the time is too short to run a frame
 ===================
 */
-qboolean Host_FilterTime (float time)
+qboolean Host_FilterTime (double time)
 {
+       double timecap;
        realtime += time;
 
        if (slowmo.value < 0.0f)
@@ -531,14 +528,27 @@ qboolean Host_FilterTime (float time)
        if (host_maxfps.value < host_minfps.value)
                Cvar_SetValue("host_maxfps", host_minfps.value);
 
-       if ((!cls.timedemo) && ((realtime - oldrealtime) < (1.0 / host_maxfps.value)))
-               return false;           // framerate is too high
+        // check if framerate is too high
+       if (!cls.timedemo)
+       {
+               timecap = sys_ticrate.value;
+               if (cls.state == ca_connected)
+                       timecap = 1.0 / host_maxfps.value;
+
+               if ((realtime - oldrealtime) < timecap)
+                       return false;
+       }
 
-       host_realframetime = host_frametime = realtime - oldrealtime; // LordHavoc: copy into host_realframetime as well
+       // LordHavoc: copy into host_realframetime as well
+       host_realframetime = host_frametime = realtime - oldrealtime;
        oldrealtime = realtime;
 
        if (cls.timedemo)
-               return true; // disable time effects
+       {
+               // disable time effects
+               cl.frametime = host_frametime;
+               return true;
+       }
 
        if (host_framerate.value > 0)
                host_frametime = host_framerate.value;
@@ -549,8 +559,7 @@ qboolean Host_FilterTime (float time)
                        host_frametime = (1.0 / host_minfps.value);
        }
 
-       host_frametime *= slowmo.value;
-       cl.frametime = host_frametime;
+       cl.frametime = host_frametime = bound(0, host_frametime * slowmo.value, 0.1f); // LordHavoc: the QC code relies on no less than 10fps
        
        return true;
 }
@@ -638,7 +647,11 @@ void _Host_Frame (float time)
        
 // decide the simulation time
        if (!Host_FilterTime (time))
-               return;                 // don't run too fast, or packets will flood out
+       {
+               // if time was rejected, don't totally hog the CPU
+               Sys_Sleep();
+               return;
+       }
                
 // get new key events
        Sys_SendKeyEvents ();
@@ -678,20 +691,18 @@ void _Host_Frame (float time)
        if (!sv.active)
                CL_SendCmd ();
 
-       host_time += host_frametime;
-
 // fetch results from server
        if (cls.state == ca_connected)
                CL_ReadFromServer ();
 
 // update video
        if (host_speeds.value)
-               time1 = Sys_FloatTime ();
+               time1 = Sys_DoubleTime ();
                
        SCR_UpdateScreen ();
 
        if (host_speeds.value)
-               time2 = Sys_FloatTime ();
+               time2 = Sys_DoubleTime ();
                
 // update audio
        if (cls.signon == SIGNONS)
@@ -707,7 +718,7 @@ void _Host_Frame (float time)
        if (host_speeds.value)
        {
                pass1 = (time1 - time3)*1000000;
-               time3 = Sys_FloatTime ();
+               time3 = Sys_DoubleTime ();
                pass2 = (time2 - time1)*1000000;
                pass3 = (time3 - time2)*1000000;
                Con_Printf ("%6ius total %6ius server %6ius gfx %6ius snd\n",
@@ -730,9 +741,9 @@ void Host_Frame (float time)
                return;
        }
        
-       time1 = Sys_FloatTime ();
+       time1 = Sys_DoubleTime ();
        _Host_Frame (time);
-       time2 = Sys_FloatTime ();       
+       time2 = Sys_DoubleTime ();      
        
        timetotal += time2 - time1;
        timecount++;
@@ -755,78 +766,16 @@ void Host_Frame (float time)
 
 //============================================================================
 
-
-extern int vcrFile;
-#define        VCR_SIGNATURE   0x56435231
-// "VCR1"
-
-void Host_InitVCR ()
-{
-       int             i, len, n;
-       char    *p;
-       
-       if (COM_CheckParm("-playback"))
-       {
-               if (com_argc != 2)
-                       Sys_Error("No other parameters allowed with -playback\n");
-
-               Sys_FileOpenRead("quake.vcr", &vcrFile);
-               if (vcrFile == -1)
-                       Sys_Error("playback file not found\n");
-
-               Sys_FileRead (vcrFile, &i, sizeof(int));
-               if (i != VCR_SIGNATURE)
-                       Sys_Error("Invalid signature in vcr file\n");
-
-               Sys_FileRead (vcrFile, &com_argc, sizeof(int));
-               com_argv = qmalloc(com_argc * sizeof(char *));
-               com_argv[0] = host_parms.argv[0];
-               for (i = 0; i < com_argc; i++)
-               {
-                       Sys_FileRead (vcrFile, &len, sizeof(int));
-                       p = qmalloc(len);
-                       Sys_FileRead (vcrFile, p, len);
-                       com_argv[i+1] = p;
-               }
-               com_argc++; /* add one for arg[0] */
-               host_parms.argc = com_argc;
-               host_parms.argv = com_argv;
-       }
-
-       if ( (n = COM_CheckParm("-record")) != 0)
-       {
-               vcrFile = Sys_FileOpenWrite("quake.vcr");
-
-               i = VCR_SIGNATURE;
-               Sys_FileWrite(vcrFile, &i, sizeof(int));
-               i = com_argc - 1;
-               Sys_FileWrite(vcrFile, &i, sizeof(int));
-               for (i = 1; i < com_argc; i++)
-               {
-                       if (i == n)
-                       {
-                               len = 10;
-                               Sys_FileWrite(vcrFile, &len, sizeof(int));
-                               Sys_FileWrite(vcrFile, "-playback", len);
-                               continue;
-                       }
-                       len = strlen(com_argv[i]) + 1;
-                       Sys_FileWrite(vcrFile, &len, sizeof(int));
-                       Sys_FileWrite(vcrFile, com_argv[i], len);
-               }
-       }
-       
-}
-
-void Render_Init();
+void Render_Init(void);
 
 /*
 ====================
 Host_Init
 ====================
 */
-void Host_Init ()
+void Host_Init (void)
 {
+       int i;
        /*
        if (standard_quake)
                minimum_memory = MINIMUM_MEMORY;
@@ -840,6 +789,24 @@ void Host_Init ()
                Sys_Error ("Only %4.1f megs of memory available, can't execute game", host_parms.memsize / (float)0x100000);
        */
 
+       host_parms.memsize = DEFAULTMEM * 1024 * 1024;
+
+       i = COM_CheckParm("-mem");
+       if (i)
+               host_parms.memsize = (int) (atof(com_argv[i+1]) * 1024 * 1024);
+
+       i = COM_CheckParm("-winmem");
+       if (i)
+               host_parms.memsize = (int) (atof(com_argv[i+1]) * 1024 * 1024);
+
+       i = COM_CheckParm("-heapsize");
+       if (i)
+               host_parms.memsize = (int) (atof(com_argv[i+1]) * 1024);
+
+       host_parms.membase = qmalloc(host_parms.memsize);
+       if (!host_parms.membase)
+               Sys_Error("Not enough memory free, close some programs and try again, or free disk space\n");
+
        com_argc = host_parms.argc;
        com_argv = host_parms.argv;
 
@@ -848,7 +815,6 @@ void Host_Init ()
        Cmd_Init ();    
        V_Init ();
        Chase_Init ();
-       Host_InitVCR ();
        COM_Init (host_parms.basedir);
        Host_InitLocal ();
        W_LoadWadFile ("gfx.wad");
@@ -863,11 +829,13 @@ void Host_Init ()
        Con_Printf ("Exe: "__TIME__" "__DATE__"\n");
        Con_Printf ("%4.1f megabyte heap\n",host_parms.memsize/(1024*1024.0));
        
-       R_InitTextures ();              // needed even for dedicated servers
        if (cls.state != ca_dedicated)
        {
-               Palette_Init("gfx/palette.lmp");
+               VID_InitCvars();
+
+               Gamma_Init();
+
+               Palette_Init();
 
 #ifndef _WIN32 // on non win32, mouse comes before video for security reasons
                IN_Init ();
@@ -926,7 +894,7 @@ void Host_Shutdown(void)
 
        if (cls.state != ca_dedicated)
        {
-               R_ShutdownModules();
+               R_Modules_Shutdown();
                VID_Shutdown();
        }
 }