]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - host.c
rewrote RecursiveHullCheck, no longer gets stuck on angle changes, and is generally...
[xonotic/darkplaces.git] / host.c
diff --git a/host.c b/host.c
index 7c165adbd9d73ee5228ab6d69971308cefdf2794..38ef5231629c7fc1f18b3f9e1270e3747ed7b782 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;
@@ -54,34 +53,34 @@ client_t    *host_client;                   // current client
 
 jmp_buf        host_abortserver;
 
-cvar_t host_framerate = {"host_framerate","0"};        // set for slow motion
-cvar_t host_speeds = {"host_speeds","0"};                      // set for running times
-cvar_t slowmo = {"slowmo", "1.0"};                                     // LordHavoc: framerate independent slowmo
-cvar_t host_minfps = {"host_minfps", "10"};            // LordHavoc: game logic lower cap on framerate (if framerate is below this is, it pretends it is this, so game logic will run normally)
-cvar_t host_maxfps = {"host_maxfps", "1000"};          // LordHavoc: framerate upper cap
+cvar_t host_framerate = {0, "host_framerate","0"};     // set for slow motion
+cvar_t host_speeds = {0, "host_speeds","0"};                   // set for running times
+cvar_t slowmo = {0, "slowmo", "1.0"};                                  // LordHavoc: framerate independent slowmo
+cvar_t host_minfps = {CVAR_SAVE, "host_minfps", "10"};         // LordHavoc: game logic lower cap on framerate (if framerate is below this is, it pretends it is this, so game logic will run normally)
+cvar_t host_maxfps = {CVAR_SAVE, "host_maxfps", "1000"};               // LordHavoc: framerate upper cap
 
-cvar_t sys_ticrate = {"sys_ticrate","0.05"};
-cvar_t serverprofile = {"serverprofile","0"};
+cvar_t sys_ticrate = {CVAR_SAVE, "sys_ticrate","0.05"};
+cvar_t serverprofile = {0, "serverprofile","0"};
 
-cvar_t fraglimit = {"fraglimit","0",false,true};
-cvar_t timelimit = {"timelimit","0",false,true};
-cvar_t teamplay = {"teamplay","0",false,true};
+cvar_t fraglimit = {CVAR_NOTIFY, "fraglimit","0"};
+cvar_t timelimit = {CVAR_NOTIFY, "timelimit","0"};
+cvar_t teamplay = {CVAR_NOTIFY, "teamplay","0"};
 
-cvar_t samelevel = {"samelevel","0"};
-cvar_t noexit = {"noexit","0",false,true};
+cvar_t samelevel = {0, "samelevel","0"};
+cvar_t noexit = {CVAR_NOTIFY, "noexit","0"};
 
-cvar_t developer = {"developer","0"};
+cvar_t developer = {0, "developer","0"};
 
-cvar_t skill = {"skill","1"};                                          // 0 - 3
-cvar_t deathmatch = {"deathmatch","0"};                        // 0, 1, or 2
-cvar_t coop = {"coop","0"};                    // 0 or 1
+cvar_t skill = {0, "skill","1"};                                               // 0 - 3
+cvar_t deathmatch = {0, "deathmatch","0"};                     // 0, 1, or 2
+cvar_t coop = {0, "coop","0"};                 // 0 or 1
 
-cvar_t pausable = {"pausable","1"};
+cvar_t pausable = {0, "pausable","1"};
 
-cvar_t temp1 = {"temp1","0"};
+cvar_t temp1 = {0, "temp1","0"};
 
-cvar_t timestamps = {"timestamps", "0", true};
-cvar_t timeformat = {"timeformat", "[%b %e %X] ", true};
+cvar_t timestamps = {CVAR_SAVE, "timestamps", "0"};
+cvar_t timeformat = {CVAR_SAVE, "timeformat", "[%b %e %X] "};
 
 /*
 ================
@@ -92,18 +91,18 @@ void Host_EndGame (char *message, ...)
 {
        va_list         argptr;
        char            string[1024];
-       
+
        va_start (argptr,message);
        vsprintf (string,message,argptr);
        va_end (argptr);
        Con_DPrintf ("Host_EndGame: %s\n",string);
-       
+
        if (sv.active)
                Host_ShutdownServer (false);
 
        if (cls.state == ca_dedicated)
                Sys_Error ("Host_EndGame: %s\n",string);        // dedicated servers exit
-       
+
        if (cls.demonum != -1)
                CL_NextDemo ();
        else
@@ -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)
+       if (host_initialized && cls.state != ca_dedicated)
        {
-               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;
 }
@@ -588,7 +597,7 @@ void Host_ServerFrame (void)
        static double frametimetotal = 0, lastservertime = 0;
        frametimetotal += host_frametime;
        // LordHavoc: cap server at sys_ticrate in listen games
-       if (!isDedicated && svs.maxclients > 1 && ((realtime - lastservertime) < sys_ticrate.value))
+       if (cls.state != ca_dedicated && svs.maxclients > 1 && ((realtime - lastservertime) < sys_ticrate.value))
                return;
 // run the world state
        sv.frametime = pr_global_struct->frametime = frametimetotal;
@@ -635,11 +644,15 @@ void _Host_Frame (float time)
 
 // keep the random time dependent
        rand ();
-       
+
 // 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 ();
 
@@ -654,7 +667,7 @@ void _Host_Frame (float time)
 // if running the server locally, make intentions now
        if (sv.active)
                CL_SendCmd ();
-       
+
 //-------------------
 //
 // server operations
@@ -663,7 +676,7 @@ void _Host_Frame (float time)
 
 // check for commands typed to the host
        Host_GetConsoleCommands ();
-       
+
        if (sv.active)
                Host_ServerFrame ();
 
@@ -678,21 +691,21 @@ 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 ();
 
+       ui_update();
+
 // 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)
        {
@@ -701,19 +714,19 @@ void _Host_Frame (float time)
        }
        else
                S_Update (vec3_origin, vec3_origin, vec3_origin, vec3_origin);
-       
+
        CDAudio_Update();
 
        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",
                                        pass1+pass2+pass3, pass1, pass2, pass3);
        }
-       
+
        host_framecount++;
 }
 
@@ -730,9 +743,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,91 +768,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;
-       else
-               minimum_memory = MINIMUM_MEMORY_LEVELPAK;
-
-       if (COM_CheckParm ("-minmemory"))
-               host_parms.memsize = minimum_memory;
-
-       if (host_parms.memsize < minimum_memory)
-               Sys_Error ("Only %4.1f megs of memory available, can't execute game", host_parms.memsize / (float)0x100000);
-       */
 
        host_parms.memsize = DEFAULTMEM * 1024 * 1024;
 
@@ -866,13 +804,12 @@ void Host_Init ()
        Cbuf_Init ();
        Cmd_Init ();    
        V_Init ();
-       Chase_Init ();
-       Host_InitVCR ();
        COM_Init (host_parms.basedir);
        Host_InitLocal ();
        W_LoadWadFile ("gfx.wad");
        Key_Init ();
        Con_Init ();    
+       Chase_Init ();
        M_Init ();      
        PR_Init ();
        Mod_Init ();
@@ -882,11 +819,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 ();