X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=host.c;h=c6ffa4aa8a472eabc7e9c0a4686b6b02b366aafb;hb=7099f710b75218eb73c73ecd662d62780f00c79b;hp=4d272b974d46c97d50a381dd7f3dbcef12a10099;hpb=b128f7ae74f68b64160fb8893d6328cafc2217c4;p=xonotic%2Fdarkplaces.git diff --git a/host.c b/host.c index 4d272b97..c6ffa4aa 100644 --- a/host.c +++ b/host.c @@ -8,7 +8,7 @@ of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. @@ -19,7 +19,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ // host.c -- coordinates spawning and killing of local servers +#include #include "quakedef.h" +#include "cl_video.h" /* @@ -35,7 +37,8 @@ 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) @@ -43,11 +46,7 @@ double realtime; // without any filtering or bounding double oldrealtime; // last frame run int host_framecount; -double sv_frametime; - -int host_hunklevel; - -int minimum_memory; +int forcedeveloper; // used for -developer commandline parameter, hacky hacky client_t *host_client; // current client @@ -124,8 +123,9 @@ 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); @@ -144,8 +144,6 @@ void Host_Error (char *error, ...) } inerror = true; -// SCR_EndLoadingPlaque (); // reenable screen updates - va_start (argptr,error); vsprintf (hosterrorstring,error,argptr); va_end (argptr); @@ -165,6 +163,8 @@ void Host_Error (char *error, ...) longjmp (host_abortserver, 1); } +static mempool_t *clients_mempool; + /* ================ Host_FindMaxClients @@ -175,7 +175,7 @@ void Host_FindMaxClients (void) int i; svs.maxclients = 1; - + i = COM_CheckParm ("-dedicated"); if (i) { @@ -200,6 +200,11 @@ void Host_FindMaxClients (void) else svs.maxclients = 8; } + + // BloodBath doesn't support single player games + if (gamemode == GAME_BLOODBATH && svs.maxclients < 4) + svs.maxclients = 4; + if (svs.maxclients < 1) svs.maxclients = 8; else if (svs.maxclients > MAX_SCOREBOARD) @@ -208,7 +213,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); @@ -225,7 +234,7 @@ Host_InitLocal void Host_InitLocal (void) { Host_InitCommands (); - + Cvar_RegisterVariable (&host_framerate); Cvar_RegisterVariable (&host_speeds); Cvar_RegisterVariable (&slowmo); @@ -242,6 +251,8 @@ void Host_InitLocal (void) Cvar_RegisterVariable (&noexit); Cvar_RegisterVariable (&skill); Cvar_RegisterVariable (&developer); + if (forcedeveloper) // make it real now that the cvar is registered + Cvar_SetValue("developer", 1); Cvar_RegisterVariable (&deathmatch); Cvar_RegisterVariable (&coop); @@ -290,7 +301,7 @@ void Host_WriteConfiguration (void) ================= SV_ClientPrintf -Sends text across to be displayed +Sends text across to be displayed FIXME: make this just a stuffed echo? ================= */ @@ -436,8 +447,7 @@ 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_DoubleTime(); @@ -498,8 +508,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)); @@ -516,6 +524,7 @@ Host_FilterTime Returns false if the time is too short to run a frame =================== */ +extern cvar_t cl_avidemo; qboolean Host_FilterTime (double time) { double timecap; @@ -527,9 +536,17 @@ qboolean Host_FilterTime (double time) Cvar_SetValue("host_minfps", 10.0f); if (host_maxfps.value < host_minfps.value) Cvar_SetValue("host_maxfps", host_minfps.value); + if (cl_avidemo.value < 0.1f && cl_avidemo.value != 0.0f) + Cvar_SetValue("cl_avidemo", 0.0f); - // check if framerate is too high - if (!cls.timedemo) + // check if framerate is too high + if (cl_avidemo.value >= 0.1f) + { + timecap = 1.0 / (double)cl_avidemo.value; + if ((realtime - oldrealtime) < timecap) + return false; + } + else if (!cls.timedemo) { timecap = sys_ticrate.value; if (cls.state == ca_connected) @@ -552,6 +569,8 @@ qboolean Host_FilterTime (double time) if (host_framerate.value > 0) host_frametime = host_framerate.value; + else if (cl_avidemo.value >= 0.1f) + host_frametime = (1.0 / cl_avidemo.value); else { // don't allow really short frames @@ -560,7 +579,7 @@ qboolean Host_FilterTime (double time) } cl.frametime = host_frametime = bound(0, host_frametime * slowmo.value, 0.1f); // LordHavoc: the QC code relies on no less than 10fps - + return true; } @@ -600,20 +619,22 @@ void Host_ServerFrame (void) 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; + if (!sv.paused && (svs.maxclients > 1 || key_dest == key_game) ) + sv.frametime = pr_global_struct->frametime = frametimetotal; + else + sv.frametime = 0; frametimetotal = 0; lastservertime = realtime; -// pr_global_struct->frametime = host_frametime; // set the time and clear the general datagram SV_ClearDatagram (); - + // check for new clients SV_CheckForNewClients (); // read client messages SV_RunClients (); - + // move things around and think // always pause in single player if in console or menus if (!sv.paused && (svs.maxclients > 1 || key_dest == key_game) ) @@ -640,7 +661,6 @@ 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 (); @@ -697,27 +717,31 @@ void _Host_Frame (float time) ui_update(); + CL_VideoFrame(); + // update video - if (host_speeds.value) + if (host_speeds.integer) time1 = Sys_DoubleTime (); - SCR_UpdateScreen (); + CL_UpdateScreen (); - if (host_speeds.value) + if (host_speeds.integer) time2 = Sys_DoubleTime (); // update audio if (cls.signon == SIGNONS) { - S_Update (r_origin, vpn, vright, vup); - CL_DecayLights (); + // LordHavoc: this used to use renderer variables (eww) + vec3_t forward, right, up; + AngleVectors(cl.viewangles, forward, right, up); + S_Update (cl_entities[cl.viewentity].render.origin, forward, right, up); } 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_DoubleTime (); @@ -728,6 +752,7 @@ void _Host_Frame (float time) } host_framecount++; + host_loopactive = true; } void Host_Frame (float time) @@ -737,12 +762,12 @@ void Host_Frame (float time) static int timecount; int i, c, m; - if (!serverprofile.value) + if (!serverprofile.integer) { _Host_Frame (time); return; } - + time1 = Sys_DoubleTime (); _Host_Frame (time); time2 = Sys_DoubleTime (); @@ -769,6 +794,7 @@ void Host_Frame (float time) //============================================================================ void Render_Init(void); +void QuakeIO_Init(void); /* ==================== @@ -777,60 +803,40 @@ 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"); + // LordHavoc: quake never seeded the random number generator before... heh + srand(time(NULL)); com_argc = host_parms.argc; com_argv = host_parms.argv; + // FIXME: this is evil, but possibly temporary + if (COM_CheckParm("-developer")) + { + forcedeveloper = true; + developer.integer = 1; + developer.value = 1; + } - 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 (); - COM_Init (host_parms.basedir); + COM_Init (); Host_InitLocal (); W_LoadWadFile ("gfx.wad"); Key_Init (); - Con_Init (); + Con_Init (); Chase_Init (); - M_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)); - + Con_Printf ("Builddate: %s\n", buildstring); + if (cls.state != ca_dedicated) { VID_InitCvars(); @@ -856,9 +862,6 @@ void Host_Init (void) Cbuf_InsertText ("exec quake.rc\n"); - Hunk_AllocName (0, "-HOST_HUNKLEVEL-"); - host_hunklevel = Hunk_LowMark (); - host_initialized = true; Sys_Printf ("========Quake Initialized=========\n"); @@ -884,9 +887,6 @@ void Host_Shutdown(void) } isdown = true; -// keep Con_Printf from trying to update the screen - scr_disabled_for_loading = true; - Host_WriteConfiguration (); CDAudio_Shutdown ();