X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=host.c;h=b404789ea93ffd4ac0b5ba13871c6ccbb6bc3d93;hp=7c165adbd9d73ee5228ab6d69971308cefdf2794;hb=c0ae57bf5351638d583698717f3d2290e5ea419b;hpb=4d162c39ec059b7f3191fbb4fb18304bc9b1db59 diff --git a/host.c b/host.c index 7c165adb..b404789e 100644 --- a/host.c +++ b/host.c @@ -35,53 +35,51 @@ Memory is cleared / released when a server or client begins, not when they end. quakeparms_t host_parms; qboolean host_initialized; // true if into command execution -qboolean hostloopactive = 0; // LordHavoc: used to turn Host_Error into Sys_Error if Host_Frame has not yet run +qboolean host_loopactive = false; // LordHavoc: used to turn Host_Error into Sys_Error if starting up or shutting down +qboolean host_shuttingdown = false; // LordHavoc: set when quit is executed 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; double sv_frametime; -int host_hunklevel; - int minimum_memory; 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 +90,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,14 +118,14 @@ This shuts down both the client and server ================ */ char hosterrorstring[4096]; -extern qboolean hostloopactive; void Host_Error (char *error, ...) { va_list argptr; static qboolean inerror = false; - // LordHavoc: if host_frame loop has not been run yet, do a Sys_Error instead - if (!hostloopactive) + // LordHavoc: if first frame has not been shown, or currently shutting + // down, do Sys_Error instead + if (!host_loopactive || host_shuttingdown) { char string[4096]; va_start (argptr,error); @@ -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); @@ -167,6 +165,8 @@ void Host_Error (char *error, ...) longjmp (host_abortserver, 1); } +static mempool_t *clients_mempool; + /* ================ Host_FindMaxClients @@ -177,7 +177,7 @@ void Host_FindMaxClients (void) int i; svs.maxclients = 1; - + i = COM_CheckParm ("-dedicated"); if (i) { @@ -210,7 +210,11 @@ void Host_FindMaxClients (void) svs.maxclientslimit = svs.maxclients; if (svs.maxclientslimit < MAX_SCOREBOARD) // LordHavoc: upped listen mode limit from 4 to MAX_SCOREBOARD svs.maxclientslimit = MAX_SCOREBOARD; - svs.clients = Hunk_AllocName (svs.maxclientslimit*sizeof(client_t), "clients"); + if (!clients_mempool) + clients_mempool = Mem_AllocPool("clients"); + if (svs.clients) + Mem_Free(svs.clients); + svs.clients = Mem_Alloc(clients_mempool, svs.maxclientslimit*sizeof(client_t)); if (svs.maxclients > 1) Cvar_SetValue ("deathmatch", 1.0); @@ -227,7 +231,7 @@ Host_InitLocal void Host_InitLocal (void) { Host_InitCommands (); - + Cvar_RegisterVariable (&host_framerate); Cvar_RegisterVariable (&host_speeds); Cvar_RegisterVariable (&slowmo); @@ -255,8 +259,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 +271,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 +287,7 @@ void Host_WriteConfiguration (void) Key_WriteBindings (f); Cvar_WriteVariables (f); - fclose (f); + Qclose (f); } } @@ -440,11 +442,10 @@ void Host_ShutdownServer(qboolean crash) sv.active = false; // stop all client sounds immediately - if (cls.state == ca_connected) - CL_Disconnect (); + CL_Disconnect (); // flush any pending messages - like the score!!! - start = Sys_FloatTime(); + start = Sys_DoubleTime(); do { count = 0; @@ -464,7 +465,7 @@ void Host_ShutdownServer(qboolean crash) } } } - if ((Sys_FloatTime() - start) > 3.0) + if ((Sys_DoubleTime() - start) > 3.0) break; } while (count); @@ -502,8 +503,6 @@ void Host_ClearMemory (void) { Con_DPrintf ("Clearing memory\n"); Mod_ClearAll (); - if (host_hunklevel) - Hunk_FreeToLowMark (host_hunklevel); cls.signon = 0; memset (&sv, 0, sizeof(sv)); @@ -520,8 +519,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 +531,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; - host_realframetime = host_frametime = realtime - oldrealtime; // LordHavoc: copy into host_realframetime as well + if ((realtime - oldrealtime) < timecap) + return false; + } + + // 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 +562,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 +600,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; @@ -631,15 +643,18 @@ void _Host_Frame (float time) if (setjmp (host_abortserver) ) return; // something bad happened, or the server disconnected - hostloopactive = 1; // 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 +669,7 @@ void _Host_Frame (float time) // if running the server locally, make intentions now if (sv.active) CL_SendCmd (); - + //------------------- // // server operations @@ -663,7 +678,7 @@ void _Host_Frame (float time) // check for commands typed to the host Host_GetConsoleCommands (); - + if (sv.active) Host_ServerFrame (); @@ -678,21 +693,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 (); - + if (host_speeds.integer) + time1 = Sys_DoubleTime (); + SCR_UpdateScreen (); - if (host_speeds.value) - time2 = Sys_FloatTime (); - + if (host_speeds.integer) + time2 = Sys_DoubleTime (); + // update audio if (cls.signon == SIGNONS) { @@ -701,20 +716,21 @@ void _Host_Frame (float time) } else S_Update (vec3_origin, vec3_origin, vec3_origin, vec3_origin); - + CDAudio_Update(); - if (host_speeds.value) + if (host_speeds.integer) { 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++; + host_loopactive = true; } void Host_Frame (float time) @@ -724,15 +740,15 @@ void Host_Frame (float time) static int timecount; int i, c, m; - if (!serverprofile.value) + if (!serverprofile.integer) { _Host_Frame (time); return; } - - time1 = Sys_FloatTime (); + + time1 = Sys_DoubleTime (); _Host_Frame (time); - time2 = Sys_FloatTime (); + time2 = Sys_DoubleTime (); timetotal += time2 - time1; timecount++; @@ -755,138 +771,47 @@ 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); +void QuakeIO_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; - - 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; - Memory_Init (host_parms.membase, host_parms.memsize); + Memory_Init (); + Cmd_Init (); + Memory_Init_Commands(); + R_Modules_Init(); Cbuf_Init (); - Cmd_Init (); + QuakeIO_Init (); V_Init (); - Chase_Init (); - Host_InitVCR (); - COM_Init (host_parms.basedir); + COM_Init (); Host_InitLocal (); W_LoadWadFile ("gfx.wad"); Key_Init (); - Con_Init (); - M_Init (); + Con_Init (); + Chase_Init (); + M_Init (); PR_Init (); Mod_Init (); NET_Init (); SV_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 (); @@ -905,9 +830,6 @@ void Host_Init () Cbuf_InsertText ("exec quake.rc\n"); - Hunk_AllocName (0, "-HOST_HUNKLEVEL-"); - host_hunklevel = Hunk_LowMark (); - host_initialized = true; Sys_Printf ("========Quake Initialized=========\n");