Made Q1 face loading faster by using a faster lightmap packing algorithm.

[xonotic/darkplaces.git] / host.c

diff --git a/host.c b/host.c
index 7888bffd8d57babefadea2d6cf56d3baf6bdbd7e..80e11e7130e4ddbeb7828bc1dcf82cbd9f39b6c7 100644 (file)
--- a/host.c
+++ b/host.c
@@ -19,10 +19,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // host.c -- coordinates spawning and killing of local servers
 
-#include <time.h>
 #include "quakedef.h"
+
+#include <time.h>
 #include "libcurl.h"
 #include "cdaudio.h"
+#include "cl_gecko.h"
 #include "cl_video.h"
 #include "progsvm.h"
 #include "csprogs.h"
@@ -58,7 +60,7 @@ cvar_t host_framerate = {0, "host_framerate","0", "locks frame timing to this va
 // shows time used by certain subsystems
 cvar_t host_speeds = {0, "host_speeds","0", "reports how much time is used in server/graphics/sound"};
 // LordHavoc: framerate upper cap
-cvar_t cl_maxfps = {CVAR_SAVE, "cl_maxfps", "1000", "maximum fps cap, if game is running faster than this it will wait before running another frame (useful to make cpu time available to other programs)"};
+cvar_t cl_maxfps = {CVAR_SAVE, "cl_maxfps", "1000000", "maximum fps cap, if game is running faster than this it will wait before running another frame (useful to make cpu time available to other programs)"};
 cvar_t cl_maxidlefps = {CVAR_SAVE, "cl_maxidlefps", "20", "maximum fps cap when the game is not the active window (makes cpu time available to other programs"};
 
 cvar_t developer = {0, "developer","0", "prints additional debugging messages and information (recommended for modders and level designers)"};
@@ -462,6 +464,18 @@ void SV_DropClient(qboolean crash)
        // update server listing on the master because player count changed
        // (which the master uses for filtering empty/full servers)
        NetConn_Heartbeat(1);
+
+       if (sv.loadgame)
+       {
+               for (i = 0;i < svs.maxclients;i++)
+                       if (svs.clients[i].active && !svs.clients[i].spawned)
+                               break;
+               if (i == svs.maxclients)
+               {
+                       Con_Printf("Loaded game, everyone rejoined - unpausing\n");
+                       sv.paused = sv.loadgame = false; // we're basically done with loading now
+               }
+       }
 }
 
 /*
@@ -527,7 +541,7 @@ void Host_GetConsoleCommands (void)
 ==================
 Host_TimeReport
 
-Returns a time report string, for example for 
+Returns a time report string, for example for
 ==================
 */
 const char *Host_TimingReport()
@@ -599,12 +613,10 @@ void Host_Main(void)
                        svs.perf_acc_realtime = svs.perf_acc_sleeptime = svs.perf_acc_lost = svs.perf_acc_offset = svs.perf_acc_offset_squared = svs.perf_acc_offset_max = svs.perf_acc_offset_samples = 0;
                }
 
-               if (slowmo.value < 0)
+               if (slowmo.value < 0.00001 && slowmo.value != 0)
                        Cvar_SetValue("slowmo", 0);
                if (host_framerate.value < 0.00001 && host_framerate.value != 0)
                        Cvar_SetValue("host_framerate", 0);
-               if (cl_maxfps.value < 1)
-                       Cvar_SetValue("cl_maxfps", 1);
 
                // keep the random time dependent, but not when playing demos/benchmarking
                if(!*sv_random_seed.string && !cls.demoplayback)
@@ -781,9 +793,9 @@ void Host_Main(void)
                                }
                        }
                        else if (vid_activewindow)
-                               clframetime = cl.realframetime = max(cl_timer, 1.0 / cl_maxfps.value);
+                               clframetime = cl.realframetime = max(cl_timer, 1.0 / max(5.0f, cl_maxfps.value));
                        else
-                               clframetime = cl.realframetime = max(cl_timer, 1.0 / cl_maxidlefps.value);
+                               clframetime = cl.realframetime = max(cl_timer, 1.0 / max(5.0f, cl_maxidlefps.value));
 
                        // apply slowmo scaling
                        clframetime *= cl.movevars_timescale;
@@ -830,7 +842,10 @@ void Host_Main(void)
 
                        //ui_update();
 
-                       CL_VideoFrame();
+                       CL_Video_Frame();
+#ifdef SUPPORT_GECKO
+                       CL_Gecko_Frame();
+#endif
 
                        CL_UpdateScreen();
 
@@ -908,6 +923,9 @@ static void Host_Init (void)
        int i;
        const char* os;
 
+       if (COM_CheckParm("-profilegameonly"))
+               Sys_AllowProfiling(false);
+
        // LordHavoc: quake never seeded the random number generator before... heh
        if (COM_CheckParm("-benchmark"))
                srand(0); // predictable random sequence for -benchmark
@@ -1143,6 +1161,9 @@ void Host_Shutdown(void)
        // AK shutdown PRVM
        // AK hmm, no PRVM_Shutdown(); yet
 
+#ifdef SUPPORT_GECKO
+       CL_Gecko_Shutdown();
+#endif
        CL_Video_Shutdown();
 
        Host_SaveConfig_f();