open client sockets before video starts, so that the Windows Firewall

[xonotic/darkplaces.git] / host.c

diff --git a/host.c b/host.c
index 4545270975be8e8b2c23a4db04dafe56b6b12f7c..f00b8e6d0623a3caa18779d6afe507076b8fa1f6 100644 (file)
--- a/host.c
+++ b/host.c
@@ -65,7 +65,7 @@ cvar_t cl_minfps_qualitymax = {CVAR_SAVE, "cl_minfps_qualitymax", "1", "highest
 cvar_t cl_minfps_qualitymin = {CVAR_SAVE, "cl_minfps_qualitymin", "0.25", "lowest allowed drawdistance multiplier"};
 cvar_t cl_minfps_qualitypower = {CVAR_SAVE, "cl_minfps_qualitypower", "4", "raises quality value to a power of itself, higher values make quality drop more sharply in relation to framerate"};
 cvar_t cl_minfps_qualityscale = {CVAR_SAVE, "cl_minfps_qualityscale", "0.5", "multiplier for quality"};
-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_maxfps = {CVAR_SAVE, "cl_maxfps", "0", "maximum fps cap, 0 = unlimited, 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)"};
@@ -103,7 +103,8 @@ void Host_Error (const char *error, ...)
        va_list argptr;
 
        // turn off rcon redirect if it was active when the crash occurred
-       rcon_redirect = false;
+       // to prevent loops when it is a networking problem
+       Con_Rcon_Redirect_Abort();
 
        va_start (argptr,error);
        dpvsnprintf (hosterrorstring1,sizeof(hosterrorstring1),error,argptr);
@@ -202,6 +203,7 @@ Host_InitLocal
 */
 void Host_SaveConfig_f(void);
 void Host_LoadConfig_f(void);
+extern cvar_t sv_writepicture_quality;
 static void Host_InitLocal (void)
 {
        Cmd_AddCommand("saveconfig", Host_SaveConfig_f, "save settings to config.cfg (or a specified filename) immediately (also automatic when quitting)");
@@ -225,6 +227,8 @@ static void Host_InitLocal (void)
 
        Cvar_RegisterVariable (&timestamps);
        Cvar_RegisterVariable (&timeformat);
+
+       Cvar_RegisterVariable (&sv_writepicture_quality);
 }
 
 
@@ -244,7 +248,7 @@ void Host_SaveConfig_to(const char *file)
        // LordHavoc: don't save a config if it crashed in startup
        if (host_framecount >= 3 && cls.state != ca_dedicated && !COM_CheckParm("-benchmark") && !COM_CheckParm("-capturedemo"))
        {
-               f = FS_Open (file, "wb", false, false);
+               f = FS_OpenRealFile(file, "wb", false);
                if (!f)
                {
                        Con_Printf("Couldn't write %s.\n", file);
@@ -528,9 +532,6 @@ void Host_ShutdownServer(void)
 
 // make sure all the clients know we're disconnecting
        SV_VM_Begin();
-       for (i = 0, host_client = svs.clients;i < svs.maxclients;i++, host_client++)
-               if (host_client->active)
-                       SV_DropClient(false); // server shutdown
        if(prog->loaded)
                if(prog->funcoffsets.SV_Shutdown)
                {
@@ -538,6 +539,9 @@ void Host_ShutdownServer(void)
                        prog->funcoffsets.SV_Shutdown = 0; // prevent it from getting called again
                        PRVM_ExecuteProgram(s,"SV_Shutdown() required");
                }
+       for (i = 0, host_client = svs.clients;i < svs.maxclients;i++, host_client++)
+               if (host_client->active)
+                       SV_DropClient(false); // server shutdown
        SV_VM_End();
 
        NetConn_CloseServerPorts();
@@ -660,6 +664,9 @@ void Host_Main(void)
 
                cl.islocalgame = NetConn_IsLocalGame();
 
+               // begin gathering mouse input
+               in_mouse_x = in_mouse_y = 0;
+
                // get new key events
                Sys_SendKeyEvents();
 
@@ -679,8 +686,8 @@ void Host_Main(void)
 
                // when a server is running we only execute console commands on server frames
                // (this mainly allows frikbot .way config files to work properly by staying in sync with the server qc)
-               // otherwise we execute them on all frames
-               if (sv_timer > 0 || !sv.active)
+               // otherwise we execute them on client frames
+               if (sv.active ? sv_timer > 0 : cl_timer > 0)
                {
                        // process console commands
                        Cbuf_Execute();
@@ -695,22 +702,15 @@ void Host_Main(void)
                        wait = cl_timer * -1000000.0;
                else
                        wait = max(cl_timer, sv_timer) * -1000000.0;
-               if (wait > 100000)
-                       wait = 100000;
+               wait = bound(0, wait, 100000);
 
-               if (!cls.timedemo && wait > 0)
+               if (!cls.timedemo && wait >= 1)
                {
                        double time0 = Sys_DoubleTime();
                        if (sv_checkforpacketsduringsleep.integer)
-                       {
-                               if (wait >= 1)
-                                       NetConn_SleepMicroseconds((int)wait);
-                       }
+                               NetConn_SleepMicroseconds((int)wait);
                        else
-                       {
-                               if (wait >= 1000)
-                                       Sys_Sleep((int)wait / 1000);
-                       }
+                               Sys_Sleep((int)wait);
                        svs.perf_acc_sleeptime += Sys_DoubleTime() - time0;
                        continue;
                }
@@ -828,10 +828,12 @@ void Host_Main(void)
                                        cl.realframetime = max(cl_timer, clframetime);
                                }
                        }
-                       else if (vid_activewindow)
-                               clframetime = cl.realframetime = max(cl_timer, 1.0 / max(5.0f, cl_maxfps.value));
+                       else if (vid_activewindow && cl_maxfps.value >= 1)
+                               clframetime = cl.realframetime = max(cl_timer, 1.0 / cl_maxfps.value);
+                       else if (!vid_activewindow && cl_maxidlefps.value >= 1)
+                               clframetime = cl.realframetime = max(cl_timer, 1.0 / cl_maxidlefps.value);
                        else
-                               clframetime = cl.realframetime = max(cl_timer, 1.0 / max(5.0f, cl_maxidlefps.value));
+                               clframetime = cl.realframetime = cl_timer;
 
                        // apply slowmo scaling
                        clframetime *= cl.movevars_timescale;
@@ -876,8 +878,6 @@ void Host_Main(void)
                        if (host_speeds.integer)
                                time1 = Sys_DoubleTime();
 
-                       //ui_update();
-
                        CL_Video_Frame();
                        CL_Gecko_Frame();
 
@@ -929,6 +929,8 @@ void Host_StartVideo(void)
        if (!vid_opened && cls.state != ca_dedicated)
        {
                vid_opened = true;
+               // make sure we open sockets before opening video because the Windows Firewall "unblock?" dialog can screw up the graphics context on some graphics drivers
+               NetConn_UpdateSockets();
                VID_Start();
                CDAudio_Startup();
        }
@@ -1036,7 +1038,9 @@ static void Host_Init (void)
        Host_InitLocal();
        Host_ServerOptions();
 
-       if (cls.state != ca_dedicated)
+       if (cls.state == ca_dedicated)
+               Cmd_AddCommand ("disconnect", CL_Disconnect_f, "disconnect from server (or disconnect all clients if running a server)");
+       else
        {
                Con_DPrintf("Initializing client\n");