X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=host.c;h=f70a17f7fd06c775dc2a12d73e5540396f09fbee;hb=d69771d5b0b6d67a0b4e91a1b2884860e86a40ce;hp=f4ee0b41c7c83a3d374df7b2d214e72432a060a5;hpb=e1229ad9d6f49317dd8a9fa895f2d937badde185;p=xonotic%2Fdarkplaces.git diff --git a/host.c b/host.c index f4ee0b41..f70a17f7 100644 --- a/host.c +++ b/host.c @@ -29,6 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "progsvm.h" #include "csprogs.h" #include "sv_demo.h" +#include "snd_main.h" /* @@ -54,11 +55,13 @@ double realtime; client_t *host_client; jmp_buf host_abortframe; +double host_starttime = 0; // pretend frames take this amount of time (in seconds), 0 = realtime cvar_t host_framerate = {0, "host_framerate","0", "locks frame timing to this value in seconds, 0.05 is 20fps for example, note that this can easily run too fast, use cl_maxfps if you want to limit your framerate instead, or sys_ticrate to limit server speed"}; // shows time used by certain subsystems cvar_t host_speeds = {0, "host_speeds","0", "reports how much time is used in server/graphics/sound"}; +cvar_t host_sleep = {0, "host_sleep","1", "gives up some processing time to other applications each frame, value in milliseconds"}; cvar_t cl_minfps = {CVAR_SAVE, "cl_minfps", "40", "minimum fps target - while the rendering performance is below this, it will drift toward lower quality"}; cvar_t cl_minfps_fade = {CVAR_SAVE, "cl_minfps_fade", "0.2", "how fast the quality adapts to varying framerate"}; cvar_t cl_minfps_qualitymax = {CVAR_SAVE, "cl_minfps_qualitymax", "1", "highest allowed drawdistance multiplier"}; @@ -103,7 +106,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); @@ -187,7 +191,7 @@ void Host_ServerOptions (void) } } - svs.maxclients = bound(1, svs.maxclients, MAX_SCOREBOARD); + svs.maxclients = svs.maxclients_next = bound(1, svs.maxclients, MAX_SCOREBOARD); svs.clients = (client_t *)Mem_Alloc(sv_mempool, sizeof(client_t) * svs.maxclients); @@ -210,6 +214,7 @@ static void Host_InitLocal (void) Cvar_RegisterVariable (&host_framerate); Cvar_RegisterVariable (&host_speeds); + Cvar_RegisterVariable (&host_sleep); Cvar_RegisterVariable (&cl_minfps); Cvar_RegisterVariable (&cl_minfps_fade); Cvar_RegisterVariable (&cl_minfps_qualitymax); @@ -247,7 +252,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); @@ -583,7 +588,7 @@ Host_TimeReport Returns a time report string, for example for ================== */ -const char *Host_TimingReport() +const char *Host_TimingReport(void) { return va("%.1f%% CPU, %.2f%% lost, offset avg %.1fms, max %.1fms, sdev %.1fms", svs.perf_cpuload * 100, svs.perf_lost * 100, svs.perf_offset_avg * 1000, svs.perf_offset_max * 1000, svs.perf_offset_sdev * 1000); } @@ -611,11 +616,14 @@ void Host_Main(void) cl_timer = 0; sv_timer = 0; - realtime = Sys_DoubleTime(); + realtime = host_starttime = Sys_DoubleTime(); for (;;) { if (setjmp(host_abortframe)) + { + SCR_ClearLoadingScreen(false); continue; // something bad happened, or the server disconnected + } oldrealtime = realtime; realtime = Sys_DoubleTime(); @@ -663,10 +671,8 @@ void Host_Main(void) cl.islocalgame = NetConn_IsLocalGame(); - // begin gathering mouse input - in_mouse_x = in_mouse_y = 0; - // get new key events + SndSys_SendKeyEvents(); Sys_SendKeyEvents(); NetConn_UpdateSockets(); @@ -689,6 +695,7 @@ void Host_Main(void) if (sv.active ? sv_timer > 0 : cl_timer > 0) { // process console commands + CL_VM_PreventInformationLeaks(); Cbuf_Execute(); } @@ -800,6 +807,11 @@ void Host_Main(void) // send all messages to the clients SV_SendClientMessages(); + + if (sv.paused == 1 && realtime > sv.pausedstart && sv.pausedstart > 0) { + prog->globals.generic[OFS_PARM0] = realtime - sv.pausedstart; + PRVM_ExecuteProgram(prog->funcoffsets.SV_PausedTic, "QC function SV_PausedTic is missing"); + } // end the server VM frame SV_VM_End(); @@ -814,11 +826,12 @@ void Host_Main(void) // //------------------- - if (cls.state != ca_dedicated && (cl_timer > 0 || cls.timedemo)) + if (cls.state != ca_dedicated && (cl_timer > 0 || cls.timedemo || cl_maxfps.value < 1)) { // decide the simulation time if (cls.capturevideo.active) { + //*** if (cls.capturevideo.realtime) clframetime = cl.realframetime = max(cl_timer, 1.0 / cls.capturevideo.framerate); else @@ -849,6 +862,9 @@ void Host_Main(void) if (host_framerate.value) clframetime = host_framerate.value; + if (cl.paused || (cl.islocalgame && (key_dest != key_game || key_consoleactive))) + clframetime = 0; + if (cls.timedemo) clframetime = cl.realframetime = cl_timer; @@ -858,6 +874,10 @@ void Host_Main(void) cl.oldtime = cl.time; cl.time += clframetime; + // update video + if (host_speeds.integer) + time1 = Sys_DoubleTime(); + // Collect input into cmd CL_Input(); @@ -873,10 +893,6 @@ void Host_Main(void) // update client world (interpolate entities, create trails, etc) CL_UpdateWorld(); - // update video - if (host_speeds.integer) - time1 = Sys_DoubleTime(); - CL_Video_Frame(); CL_Gecko_Frame(); @@ -896,6 +912,9 @@ void Host_Main(void) CDAudio_Update(); + // reset gathering of mouse input + in_mouse_x = in_mouse_y = 0; + if (host_speeds.integer) { pass1 = (int)((time1 - time3)*1000000); @@ -905,8 +924,15 @@ void Host_Main(void) Con_Printf("%6ius total %6ius server %6ius gfx %6ius snd\n", pass1+pass2+pass3, pass1, pass2, pass3); } + wait = bound(0, host_sleep.value * 1000, 100000); + if (!cls.timedemo && wait >= 1) + Sys_Sleep((int)wait); } +#if MEMPARANOIA + Mem_CheckSentinelsGlobal(); +#endif + // if there is some time remaining from this frame, reset the timers if (cl_timer >= 0) cl_timer = 0; @@ -928,6 +954,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(); } @@ -966,8 +994,12 @@ static void Host_Init (void) srand(time(NULL)); // FIXME: this is evil, but possibly temporary + // LordHavoc: doesn't seem very temporary... + // LordHavoc: enabled this by default on debug +#ifndef DEBUG // COMMANDLINEOPTION: Console: -developer enables warnings and other notices (RECOMMENDED for mod developers) if (COM_CheckParm("-developer")) +#endif { developer.value = developer.integer = 1; developer.string = "1"; @@ -1195,10 +1227,12 @@ void Host_Shutdown(void) } Cmd_Shutdown(); + Key_Shutdown(); CL_Shutdown(); Sys_Shutdown(); Log_Close(); FS_Shutdown(); + Con_Shutdown(); Memory_Shutdown(); }