X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=host.c;h=c0741a68b7e001c69f474e6d7e0a954355ba591d;hp=b419f8a963b8c75c55458689ec740051d1e6673d;hb=ed67cc8325ba6c8cbdd36f2271703b3814b57940;hpb=7305ab0695a23466c3554c8670c3b8a38bbc54a9 diff --git a/host.c b/host.c index b419f8a9..c0741a68 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" /* @@ -32,10 +34,9 @@ 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,44 +44,42 @@ 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 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 sv_echobprint = {CVAR_SAVE, "sv_echobprint", "1"}; // print broadcast messages in dedicated mode -cvar_t fraglimit = {"fraglimit","0",false,true}; -cvar_t timelimit = {"timelimit","0",false,true}; -cvar_t teamplay = {"teamplay","0",false,true}; +cvar_t sys_ticrate = {CVAR_SAVE, "sys_ticrate","0.05"}; +cvar_t serverprofile = {0, "serverprofile","0"}; -cvar_t samelevel = {"samelevel","0"}; -cvar_t noexit = {"noexit","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 developer = {"developer","0"}; +cvar_t samelevel = {0, "samelevel","0"}; +cvar_t noexit = {CVAR_NOTIFY, "noexit","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 developer = {0, "developer","0"}; -cvar_t pausable = {"pausable","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 temp1 = {"temp1","0"}; +cvar_t pausable = {0, "pausable","1"}; -cvar_t timestamps = {"timestamps", "0", true}; -cvar_t timeformat = {"timeformat", "[%b %e %X] ", true}; +cvar_t temp1 = {0, "temp1","0"}; + +cvar_t timestamps = {CVAR_SAVE, "timestamps", "0"}; +cvar_t timeformat = {CVAR_SAVE, "timeformat", "[%b %e %X] "}; /* ================ @@ -91,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 @@ -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; } + + // Transfusion doesn't support single player games + if (gamemode == GAME_TRANSFUSION && 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,13 +234,15 @@ Host_InitLocal void Host_InitLocal (void) { Host_InitCommands (); - + Cvar_RegisterVariable (&host_framerate); Cvar_RegisterVariable (&host_speeds); Cvar_RegisterVariable (&slowmo); Cvar_RegisterVariable (&host_minfps); Cvar_RegisterVariable (&host_maxfps); + Cvar_RegisterVariable (&sv_echobprint); + Cvar_RegisterVariable (&sys_ticrate); Cvar_RegisterVariable (&serverprofile); @@ -242,6 +253,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); @@ -269,7 +282,7 @@ void Host_WriteConfiguration (void) // 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 = Qopen (va("%s/config.cfg",com_gamedir), "w"); if (!f) @@ -290,7 +303,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? ================= */ @@ -330,6 +343,9 @@ void SV_BroadcastPrintf (char *fmt, ...) MSG_WriteByte (&svs.clients[i].message, svc_print); MSG_WriteString (&svs.clients[i].message, string); } + + if (sv_echobprint.integer && cls.state == ca_dedicated) + Sys_Printf ("%s", string); } /* @@ -347,7 +363,7 @@ void Host_ClientCommands (char *fmt, ...) va_start (argptr,fmt); vsprintf (string, fmt,argptr); va_end (argptr); - + MSG_WriteByte (&host_client->message, svc_stufftext); MSG_WriteString (&host_client->message, string); } @@ -436,8 +452,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 +513,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 +529,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,26 +541,42 @@ 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) + { + // default to sys_ticrate (server framerate - presumably low) unless we're the active window and either connected to a server or playing a video timecap = sys_ticrate.value; - if (cls.state == ca_connected) + if (vid_activewindow && (cls.state == ca_connected || cl_videoplaying)) timecap = 1.0 / host_maxfps.value; if ((realtime - oldrealtime) < timecap) return false; } - host_realframetime = host_frametime = realtime - oldrealtime; // LordHavoc: copy into host_realframetime as well + // 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; + else if (cl_avidemo.value >= 0.1f) + host_frametime = (1.0 / cl_avidemo.value); else { // don't allow really short frames @@ -555,7 +585,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; } @@ -592,23 +622,25 @@ 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; + 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) ) @@ -635,11 +667,10 @@ 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)) { @@ -647,7 +678,7 @@ void _Host_Frame (float time) Sys_Sleep(); return; } - + // get new key events Sys_SendKeyEvents (); @@ -662,7 +693,7 @@ void _Host_Frame (float time) // if running the server locally, make intentions now if (sv.active) CL_SendCmd (); - + //------------------- // // server operations @@ -671,7 +702,7 @@ void _Host_Frame (float time) // check for commands typed to the host Host_GetConsoleCommands (); - + if (sv.active) Host_ServerFrame (); @@ -690,27 +721,33 @@ void _Host_Frame (float time) if (cls.state == ca_connected) CL_ReadFromServer (); + ui_update(); + + CL_VideoFrame(); + // update video - if (host_speeds.value) + if (host_speeds.integer) time1 = Sys_DoubleTime (); - - SCR_UpdateScreen (); - if (host_speeds.value) + CL_UpdateScreen (); + + 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 (); @@ -719,8 +756,9 @@ void _Host_Frame (float time) 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) @@ -730,12 +768,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 (); @@ -762,6 +800,7 @@ void Host_Frame (float time) //============================================================================ void Render_Init(void); +void QuakeIO_Init(void); /* ==================== @@ -770,60 +809,37 @@ 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); + // LordHavoc: quake never seeded the random number generator before... heh + srand(time(NULL)); - 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; + // 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); + Cmd_Init (); + Memory_Init_Commands(); + R_Modules_Init(); Cbuf_Init (); - Cmd_Init (); + QuakeIO_Init (); V_Init (); - Chase_Init (); - 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)); - + Con_Printf ("Builddate: %s\n", buildstring); + if (cls.state != ca_dedicated) { VID_InitCvars(); @@ -849,9 +865,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"); @@ -877,9 +890,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 ();