X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=host.c;h=18d986299358c85c1e26a06a92dff455c09bb214;hb=cf03adfc67295bfeff10abafc9505090f527ed48;hp=2e5030350f4f8a40e2c26189c8cbf7a77cc4eb58;hpb=d6f8468a651dc24bae9974b0b37e4d1fb04cacda;p=xonotic%2Fdarkplaces.git diff --git a/host.c b/host.c index 2e503035..18d98629 100644 --- a/host.c +++ b/host.c @@ -29,6 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "csprogs.h" #include "sv_demo.h" #include "snd_main.h" +#include "taskqueue.h" #include "thread.h" #include "utf8lib.h" @@ -43,52 +44,38 @@ Memory is cleared / released when a server or client begins, not when they end. */ -// how many frames have occurred -// (checked by Host_Error and Host_SaveConfig_f) -int host_framecount = 0; -// LordHavoc: set when quit is executed -qboolean host_shuttingdown = false; - -// the accumulated mainloop time since application started (with filtering), without any slowmo or clamping -double realtime; -// the main loop wall time for this frame -double host_dirtytime; - -// current client -client_t *host_client; - -jmp_buf host_abortframe; +host_t host; // 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"}; -cvar_t cl_maxphysicsframesperserverframe = {0, "cl_maxphysicsframesperserverframe","10", "maximum number of physics frames per server frame"}; +cvar_t host_framerate = {CVAR_CLIENT | CVAR_SERVER, "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"}; +cvar_t cl_maxphysicsframesperserverframe = {CVAR_CLIENT, "cl_maxphysicsframesperserverframe","10", "maximum number of physics frames per server frame"}; // 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_maxwait = {0, "host_maxwait","1000", "maximum sleep time requested from the operating system in millisecond. Larger sleeps will be done using multiple host_maxwait length sleeps. Lowering this value will increase CPU load, but may help working around problems with accuracy of sleep times."}; -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", "1", "how fast the quality adapts to varying framerate"}; -cvar_t cl_minfps_qualitymax = {CVAR_SAVE, "cl_minfps_qualitymax", "1", "highest allowed drawdistance multiplier"}; -cvar_t cl_minfps_qualitymin = {CVAR_SAVE, "cl_minfps_qualitymin", "0.25", "lowest allowed drawdistance multiplier"}; -cvar_t cl_minfps_qualitymultiply = {CVAR_SAVE, "cl_minfps_qualitymultiply", "0.2", "multiplier for quality changes in quality change per second render time (1 assumes linearity of quality and render time)"}; -cvar_t cl_minfps_qualityhysteresis = {CVAR_SAVE, "cl_minfps_qualityhysteresis", "0.05", "reduce all quality increments by this to reduce flickering"}; -cvar_t cl_minfps_qualitystepmax = {CVAR_SAVE, "cl_minfps_qualitystepmax", "0.1", "maximum quality change in a single frame"}; -cvar_t cl_minfps_force = {0, "cl_minfps_force", "0", "also apply quality reductions in timedemo/capturevideo"}; -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_maxfps_alwayssleep = {0, "cl_maxfps_alwayssleep","1", "gives up some processing time to other applications each frame, value in milliseconds, disabled if cl_maxfps is 0"}; -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 = {CVAR_SAVE, "developer","0", "shows debugging messages and information (recommended for all developers and level designers); the value -1 also suppresses buffering and logging these messages"}; -cvar_t developer_extra = {0, "developer_extra", "0", "prints additional debugging messages, often very verbose!"}; -cvar_t developer_insane = {0, "developer_insane", "0", "prints huge streams of information about internal workings, entire contents of files being read/written, etc. Not recommended!"}; -cvar_t developer_loadfile = {0, "developer_loadfile","0", "prints name and size of every file loaded via the FS_LoadFile function (which is almost everything)"}; -cvar_t developer_loading = {0, "developer_loading","0", "prints information about files as they are loaded or unloaded successfully"}; -cvar_t developer_entityparsing = {0, "developer_entityparsing", "0", "prints detailed network entities information each time a packet is received"}; - -cvar_t timestamps = {CVAR_SAVE, "timestamps", "0", "prints timestamps on console messages"}; -cvar_t timeformat = {CVAR_SAVE, "timeformat", "[%Y-%m-%d %H:%M:%S] ", "time format to use on timestamped console messages"}; - -cvar_t sessionid = {CVAR_READONLY, "sessionid", "", "ID of the current session (use the -sessionid parameter to set it); this is always either empty or begins with a dot (.)"}; -cvar_t locksession = {0, "locksession", "0", "Lock the session? 0 = no, 1 = yes and abort on failure, 2 = yes and continue on failure"}; +cvar_t host_speeds = {CVAR_CLIENT | CVAR_SERVER, "host_speeds","0", "reports how much time is used in server/graphics/sound"}; +cvar_t host_maxwait = {CVAR_CLIENT | CVAR_SERVER, "host_maxwait","1000", "maximum sleep time requested from the operating system in millisecond. Larger sleeps will be done using multiple host_maxwait length sleeps. Lowering this value will increase CPU load, but may help working around problems with accuracy of sleep times."}; +cvar_t cl_minfps = {CVAR_CLIENT | 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_CLIENT | CVAR_SAVE, "cl_minfps_fade", "1", "how fast the quality adapts to varying framerate"}; +cvar_t cl_minfps_qualitymax = {CVAR_CLIENT | CVAR_SAVE, "cl_minfps_qualitymax", "1", "highest allowed drawdistance multiplier"}; +cvar_t cl_minfps_qualitymin = {CVAR_CLIENT | CVAR_SAVE, "cl_minfps_qualitymin", "0.25", "lowest allowed drawdistance multiplier"}; +cvar_t cl_minfps_qualitymultiply = {CVAR_CLIENT | CVAR_SAVE, "cl_minfps_qualitymultiply", "0.2", "multiplier for quality changes in quality change per second render time (1 assumes linearity of quality and render time)"}; +cvar_t cl_minfps_qualityhysteresis = {CVAR_CLIENT | CVAR_SAVE, "cl_minfps_qualityhysteresis", "0.05", "reduce all quality increments by this to reduce flickering"}; +cvar_t cl_minfps_qualitystepmax = {CVAR_CLIENT | CVAR_SAVE, "cl_minfps_qualitystepmax", "0.1", "maximum quality change in a single frame"}; +cvar_t cl_minfps_force = {CVAR_CLIENT, "cl_minfps_force", "0", "also apply quality reductions in timedemo/capturevideo"}; +cvar_t cl_maxfps = {CVAR_CLIENT | 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_maxfps_alwayssleep = {CVAR_CLIENT, "cl_maxfps_alwayssleep","1", "gives up some processing time to other applications each frame, value in milliseconds, disabled if cl_maxfps is 0"}; +cvar_t cl_maxidlefps = {CVAR_CLIENT | 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 = {CVAR_CLIENT | CVAR_SERVER | CVAR_SAVE, "developer","0", "shows debugging messages and information (recommended for all developers and level designers); the value -1 also suppresses buffering and logging these messages"}; +cvar_t developer_extra = {CVAR_CLIENT | CVAR_SERVER, "developer_extra", "0", "prints additional debugging messages, often very verbose!"}; +cvar_t developer_insane = {CVAR_CLIENT | CVAR_SERVER, "developer_insane", "0", "prints huge streams of information about internal workings, entire contents of files being read/written, etc. Not recommended!"}; +cvar_t developer_loadfile = {CVAR_CLIENT | CVAR_SERVER, "developer_loadfile","0", "prints name and size of every file loaded via the FS_LoadFile function (which is almost everything)"}; +cvar_t developer_loading = {CVAR_CLIENT | CVAR_SERVER, "developer_loading","0", "prints information about files as they are loaded or unloaded successfully"}; +cvar_t developer_entityparsing = {CVAR_CLIENT, "developer_entityparsing", "0", "prints detailed network entities information each time a packet is received"}; + +cvar_t timestamps = {CVAR_CLIENT | CVAR_SERVER | CVAR_SAVE, "timestamps", "0", "prints timestamps on console messages"}; +cvar_t timeformat = {CVAR_CLIENT | CVAR_SERVER | CVAR_SAVE, "timeformat", "[%Y-%m-%d %H:%M:%S] ", "time format to use on timestamped console messages"}; + +cvar_t sessionid = {CVAR_CLIENT | CVAR_SERVER | CVAR_READONLY, "sessionid", "", "ID of the current session (use the -sessionid parameter to set it); this is always either empty or begins with a dot (.)"}; +cvar_t locksession = {CVAR_CLIENT | CVAR_SERVER, "locksession", "0", "Lock the session? 0 = no, 1 = yes and abort on failure, 2 = yes and continue on failure"}; /* ================ @@ -97,12 +84,13 @@ Host_AbortCurrentFrame aborts the current host frame and goes on with the next one ================ */ +void Host_AbortCurrentFrame(void) DP_FUNC_NORETURN; void Host_AbortCurrentFrame(void) { // in case we were previously nice, make us mean again Sys_MakeProcessMean(); - longjmp (host_abortframe, 1); + longjmp (host.abortframe, 1); } /* @@ -127,11 +115,11 @@ void Host_Error (const char *error, ...) dpvsnprintf (hosterrorstring1,sizeof(hosterrorstring1),error,argptr); va_end (argptr); - Con_Printf("Host_Error: %s\n", hosterrorstring1); + Con_Printf(CON_ERROR "Host_Error: %s\n", hosterrorstring1); - // LordHavoc: if crashing very early, or currently shutting down, do + // LadyHavoc: if crashing very early, or currently shutting down, do // Sys_Error instead - if (host_framecount < 3 || host_shuttingdown) + if (host.framecount < 3 || host.state == host_shutdown) Sys_Error ("Host_Error: %s", hosterrorstring1); if (hosterror) @@ -149,14 +137,16 @@ void Host_Error (const char *error, ...) // print out where the crash happened, if it was caused by QC (and do a cleanup) PRVM_Crash(SVVM_prog); PRVM_Crash(CLVM_prog); +#ifdef CONFIG_MENU PRVM_Crash(MVM_prog); +#endif cl.csqc_loaded = false; Cvar_SetValueQuick(&csqc_progcrc, -1); Cvar_SetValueQuick(&csqc_progsize, -1); SV_LockThreadMutex(); - Host_ShutdownServer (); + SV_Shutdown (); SV_UnlockThreadMutex(); if (cls.state == ca_dedicated) @@ -186,12 +176,12 @@ static void Host_ServerOptions (void) { cls.state = ca_dedicated; // check for -dedicated specifying how many players - if (i && i + 1 < com_argc && atoi (com_argv[i+1]) >= 1) - svs.maxclients = atoi (com_argv[i+1]); + if (i && i + 1 < sys.argc && atoi (sys.argv[i+1]) >= 1) + svs.maxclients = atoi (sys.argv[i+1]); if (COM_CheckParm ("-listen")) Con_Printf ("Only one of -dedicated or -listen can be specified\n"); // default sv_public on for dedicated servers (often hosted by serious administrators), off for listen servers (often hosted by clueless users) - Cvar_SetValue("sv_public", 1); + Cvar_SetValue(&cvars_all, "sv_public", 1); } else if (cl_available) { @@ -201,13 +191,13 @@ static void Host_ServerOptions (void) if (i) { // default players unless specified - if (i + 1 < com_argc && atoi (com_argv[i+1]) >= 1) - svs.maxclients = atoi (com_argv[i+1]); + if (i + 1 < sys.argc && atoi (sys.argv[i+1]) >= 1) + svs.maxclients = atoi (sys.argv[i+1]); } else { // default players in some games, singleplayer in most - if (gamemode != GAME_GOODVSBAD2 && gamemode != GAME_NEXUIZ && gamemode != GAME_XONOTIC && gamemode != GAME_BATTLEMECH) + if (gamemode != GAME_GOODVSBAD2 && !IS_NEXUIZ_DERIVED(gamemode) && gamemode != GAME_BATTLEMECH) svs.maxclients = 1; } } @@ -220,20 +210,39 @@ static void Host_ServerOptions (void) Cvar_SetValueQuick(&deathmatch, 1); } +/* +================== +Host_Quit_f +================== +*/ +void Host_Quit_f(cmd_state_t *cmd) +{ + if(host.state == host_shutdown) + Con_Printf("shutting down already!\n"); + else + host.state = host_shutdown; +} + +static void Host_Version_f(cmd_state_t *cmd) +{ + Con_Printf("Version: %s build %s\n", gamename, buildstring); +} + /* ======================= Host_InitLocal ====================== */ -void Host_SaveConfig_f(void); -void Host_LoadConfig_f(void); +void Host_SaveConfig_f(cmd_state_t *cmd); +void Host_LoadConfig_f(cmd_state_t *cmd); extern cvar_t sv_writepicture_quality; extern cvar_t r_texture_jpeg_fastpicmip; 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)"); - Cmd_AddCommand("loadconfig", Host_LoadConfig_f, "reset everything and reload configs"); - + Cmd_AddCommand(CMD_SHARED, "quit", Host_Quit_f, "quit the game"); + Cmd_AddCommand(CMD_SHARED, "version", Host_Version_f, "print engine version"); + Cmd_AddCommand(CMD_SHARED, "saveconfig", Host_SaveConfig_f, "save settings to config.cfg (or a specified filename) immediately (also automatic when quitting)"); + Cmd_AddCommand(CMD_SHARED, "loadconfig", Host_LoadConfig_f, "reset everything and reload configs"); Cvar_RegisterVariable (&cl_maxphysicsframesperserverframe); Cvar_RegisterVariable (&host_framerate); Cvar_RegisterVariable (&host_speeds); @@ -278,18 +287,18 @@ static void Host_SaveConfig_to(const char *file) // dedicated servers initialize the host but don't parse and set the // config.cfg cvars - // 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")) + // LadyHavoc: 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_OpenRealFile(file, "wb", false); if (!f) { - Con_Printf("Couldn't write %s.\n", file); + Con_Printf(CON_ERROR "Couldn't write %s.\n", file); return; } Key_WriteBindings (f); - Cvar_WriteVariables (f); + Cvar_WriteVariables (&cvars_all, f); FS_Close (f); } @@ -298,30 +307,31 @@ void Host_SaveConfig(void) { Host_SaveConfig_to(CONFIGFILENAME); } -void Host_SaveConfig_f(void) +void Host_SaveConfig_f(cmd_state_t *cmd) { const char *file = CONFIGFILENAME; - if(Cmd_Argc() >= 2) { - file = Cmd_Argv(1); + if(Cmd_Argc(cmd) >= 2) { + file = Cmd_Argv(cmd, 1); Con_Printf("Saving to %s\n", file); } Host_SaveConfig_to(file); } -static void Host_AddConfigText(void) +static void Host_AddConfigText(cmd_state_t *cmd) { // set up the default startmap_sp and startmap_dm aliases (mods can // override these) and then execute the quake.rc startup script if (gamemode == GAME_NEHAHRA) - Cbuf_InsertText("alias startmap_sp \"map nehstart\"\nalias startmap_dm \"map nehstart\"\nexec " STARTCONFIGFILENAME "\n"); + Cbuf_InsertText(cmd, "alias startmap_sp \"map nehstart\"\nalias startmap_dm \"map nehstart\"\nexec " STARTCONFIGFILENAME "\n"); else if (gamemode == GAME_TRANSFUSION) - Cbuf_InsertText("alias startmap_sp \"map e1m1\"\n""alias startmap_dm \"map bb1\"\nexec " STARTCONFIGFILENAME "\n"); + Cbuf_InsertText(cmd, "alias startmap_sp \"map e1m1\"\n""alias startmap_dm \"map bb1\"\nexec " STARTCONFIGFILENAME "\n"); else if (gamemode == GAME_TEU) - Cbuf_InsertText("alias startmap_sp \"map start\"\nalias startmap_dm \"map start\"\nexec teu.rc\n"); + Cbuf_InsertText(cmd, "alias startmap_sp \"map start\"\nalias startmap_dm \"map start\"\nexec teu.rc\n"); else - Cbuf_InsertText("alias startmap_sp \"map start\"\nalias startmap_dm \"map start\"\nexec " STARTCONFIGFILENAME "\n"); + Cbuf_InsertText(cmd, "alias startmap_sp \"map start\"\nalias startmap_dm \"map start\"\nexec " STARTCONFIGFILENAME "\n"); + Cbuf_Execute(cmd); } /* @@ -331,290 +341,18 @@ Host_LoadConfig_f Resets key bindings and cvars to defaults and then reloads scripts =============== */ -void Host_LoadConfig_f(void) +void Host_LoadConfig_f(cmd_state_t *cmd) { // reset all cvars, commands and aliases to init values Cmd_RestoreInitState(); +#ifdef CONFIG_MENU // prepend a menu restart command to execute after the config - Cbuf_InsertText("\nmenu_restart\n"); + Cbuf_InsertText(&cmd_client, "\nmenu_restart\n"); +#endif // reset cvars to their defaults, and then exec startup scripts again - Host_AddConfigText(); -} - -/* -================= -SV_ClientPrint - -Sends text across to be displayed -FIXME: make this just a stuffed echo? -================= -*/ -void SV_ClientPrint(const char *msg) -{ - if (host_client->netconnection) - { - MSG_WriteByte(&host_client->netconnection->message, svc_print); - MSG_WriteString(&host_client->netconnection->message, msg); - } -} - -/* -================= -SV_ClientPrintf - -Sends text across to be displayed -FIXME: make this just a stuffed echo? -================= -*/ -void SV_ClientPrintf(const char *fmt, ...) -{ - va_list argptr; - char msg[MAX_INPUTLINE]; - - va_start(argptr,fmt); - dpvsnprintf(msg,sizeof(msg),fmt,argptr); - va_end(argptr); - - SV_ClientPrint(msg); -} - -/* -================= -SV_BroadcastPrint - -Sends text to all active clients -================= -*/ -void SV_BroadcastPrint(const char *msg) -{ - int i; - client_t *client; - - for (i = 0, client = svs.clients;i < svs.maxclients;i++, client++) - { - if (client->active && client->netconnection) - { - MSG_WriteByte(&client->netconnection->message, svc_print); - MSG_WriteString(&client->netconnection->message, msg); - } - } - - if (sv_echobprint.integer && cls.state == ca_dedicated) - Con_Print(msg); -} - -/* -================= -SV_BroadcastPrintf - -Sends text to all active clients -================= -*/ -void SV_BroadcastPrintf(const char *fmt, ...) -{ - va_list argptr; - char msg[MAX_INPUTLINE]; - - va_start(argptr,fmt); - dpvsnprintf(msg,sizeof(msg),fmt,argptr); - va_end(argptr); - - SV_BroadcastPrint(msg); + Host_AddConfigText(&cmd_client); } -/* -================= -Host_ClientCommands - -Send text over to the client to be executed -================= -*/ -void Host_ClientCommands(const char *fmt, ...) -{ - va_list argptr; - char string[MAX_INPUTLINE]; - - if (!host_client->netconnection) - return; - - va_start(argptr,fmt); - dpvsnprintf(string, sizeof(string), fmt, argptr); - va_end(argptr); - - MSG_WriteByte(&host_client->netconnection->message, svc_stufftext); - MSG_WriteString(&host_client->netconnection->message, string); -} - -/* -===================== -SV_DropClient - -Called when the player is getting totally kicked off the host -if (crash = true), don't bother sending signofs -===================== -*/ -void SV_DropClient(qboolean crash) -{ - prvm_prog_t *prog = SVVM_prog; - int i; - Con_Printf("Client \"%s\" dropped\n", host_client->name); - - SV_StopDemoRecording(host_client); - - // make sure edict is not corrupt (from a level change for example) - host_client->edict = PRVM_EDICT_NUM(host_client - svs.clients + 1); - - if (host_client->netconnection) - { - // tell the client to be gone - if (!crash) - { - // LordHavoc: no opportunity for resending, so use unreliable 3 times - unsigned char bufdata[8]; - sizebuf_t buf; - memset(&buf, 0, sizeof(buf)); - buf.data = bufdata; - buf.maxsize = sizeof(bufdata); - MSG_WriteByte(&buf, svc_disconnect); - NetConn_SendUnreliableMessage(host_client->netconnection, &buf, sv.protocol, 10000, false); - NetConn_SendUnreliableMessage(host_client->netconnection, &buf, sv.protocol, 10000, false); - NetConn_SendUnreliableMessage(host_client->netconnection, &buf, sv.protocol, 10000, false); - } - } - - // call qc ClientDisconnect function - // LordHavoc: don't call QC if server is dead (avoids recursive - // Host_Error in some mods when they run out of edicts) - if (host_client->clientconnectcalled && sv.active && host_client->edict) - { - // call the prog function for removing a client - // this will set the body to a dead frame, among other things - int saveSelf = PRVM_serverglobaledict(self); - host_client->clientconnectcalled = false; - PRVM_serverglobalfloat(time) = sv.time; - PRVM_serverglobaledict(self) = PRVM_EDICT_TO_PROG(host_client->edict); - prog->ExecuteProgram(prog, PRVM_serverfunction(ClientDisconnect), "QC function ClientDisconnect is missing"); - PRVM_serverglobaledict(self) = saveSelf; - } - - if (host_client->netconnection) - { - // break the net connection - NetConn_Close(host_client->netconnection); - host_client->netconnection = NULL; - } - - // if a download is active, close it - if (host_client->download_file) - { - Con_DPrintf("Download of %s aborted when %s dropped\n", host_client->download_name, host_client->name); - FS_Close(host_client->download_file); - host_client->download_file = NULL; - host_client->download_name[0] = 0; - host_client->download_expectedposition = 0; - host_client->download_started = false; - } - - // remove leaving player from scoreboard - host_client->name[0] = 0; - host_client->colors = 0; - host_client->frags = 0; - // send notification to all clients - // get number of client manually just to make sure we get it right... - i = host_client - svs.clients; - MSG_WriteByte (&sv.reliable_datagram, svc_updatename); - MSG_WriteByte (&sv.reliable_datagram, i); - MSG_WriteString (&sv.reliable_datagram, host_client->name); - MSG_WriteByte (&sv.reliable_datagram, svc_updatecolors); - MSG_WriteByte (&sv.reliable_datagram, i); - MSG_WriteByte (&sv.reliable_datagram, host_client->colors); - MSG_WriteByte (&sv.reliable_datagram, svc_updatefrags); - MSG_WriteByte (&sv.reliable_datagram, i); - MSG_WriteShort (&sv.reliable_datagram, host_client->frags); - - // free the client now - if (host_client->entitydatabase) - EntityFrame_FreeDatabase(host_client->entitydatabase); - if (host_client->entitydatabase4) - EntityFrame4_FreeDatabase(host_client->entitydatabase4); - if (host_client->entitydatabase5) - EntityFrame5_FreeDatabase(host_client->entitydatabase5); - - if (sv.active) - { - // clear a fields that matter to DP_SV_CLIENTNAME and DP_SV_CLIENTCOLORS, and also frags - PRVM_ED_ClearEdict(prog, host_client->edict); - } - - // clear the client struct (this sets active to false) - memset(host_client, 0, sizeof(*host_client)); - - // update server listing on the master because player count changed - // (which the master uses for filtering empty/full servers) - NetConn_Heartbeat(1); - - if (sv.loadgame) - { - for (i = 0;i < svs.maxclients;i++) - if (svs.clients[i].active && !svs.clients[i].spawned) - break; - if (i == svs.maxclients) - { - Con_Printf("Loaded game, everyone rejoined - unpausing\n"); - sv.paused = sv.loadgame = false; // we're basically done with loading now - } - } -} - -/* -================== -Host_ShutdownServer - -This only happens at the end of a game, not between levels -================== -*/ -void Host_ShutdownServer(void) -{ - prvm_prog_t *prog = SVVM_prog; - int i; - - Con_DPrintf("Host_ShutdownServer\n"); - - if (!sv.active) - return; - - NetConn_Heartbeat(2); - NetConn_Heartbeat(2); - -// make sure all the clients know we're disconnecting - World_End(&sv.world); - if(prog->loaded) - { - if(PRVM_serverfunction(SV_Shutdown)) - { - func_t s = PRVM_serverfunction(SV_Shutdown); - PRVM_serverglobalfloat(time) = sv.time; - PRVM_serverfunction(SV_Shutdown) = 0; // prevent it from getting called again - prog->ExecuteProgram(prog, 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 - - NetConn_CloseServerPorts(); - - sv.active = false; -// -// clear structures -// - memset(&sv, 0, sizeof(sv)); - memset(svs.clients, 0, svs.maxclients*sizeof(client_t)); - - cl.islocalgame = false; -} - - //============================================================================ /* @@ -626,14 +364,14 @@ Add them exactly as if they had been typed at the console */ static void Host_GetConsoleCommands (void) { - char *cmd; + char *line; - while (1) + while ((line = Sys_ConsoleInput())) { - cmd = Sys_ConsoleInput (); - if (!cmd) - break; - Cbuf_AddText (cmd); + if (cls.state == ca_dedicated) + Cbuf_AddText(&cmd_server, line); + else + Cbuf_AddText(&cmd_client, line); } } @@ -663,53 +401,56 @@ void Host_Main(void) double time2 = 0; double time3 = 0; double cl_timer = 0, sv_timer = 0; - double clframetime, deltacleantime, olddirtytime, dirtytime; + double clframetime, time, oldtime, newtime; double wait; int pass1, pass2, pass3, i; char vabuf[1024]; qboolean playing; + host.restless = false; + Host_Init(); - realtime = 0; - dirtytime = Sys_DirtyTime(); - for (;;) + host.realtime = 0; + host.dirtytime = Sys_DirtyTime(); + + while(host.state != host_shutdown) { - if (setjmp(host_abortframe)) + if (setjmp(host.abortframe)) { SCR_ClearLoadingScreen(false); continue; // something bad happened, or the server disconnected } - olddirtytime = host_dirtytime; - dirtytime = Sys_DirtyTime(); - deltacleantime = dirtytime - olddirtytime; - if (deltacleantime < 0) + oldtime = host.dirtytime; + newtime = Sys_DirtyTime(); + time = newtime - oldtime; + if (time < 0) { // warn if it's significant - if (deltacleantime < -0.01) - Con_Printf("Host_Mingled: time stepped backwards (went from %f to %f, difference %f)\n", olddirtytime, dirtytime, deltacleantime); - deltacleantime = 0; + if (time < -0.01) + Con_Printf(CON_WARN "Host_Mingled: time stepped backwards (went from %f to %f, difference %f)\n", oldtime, newtime, time); + time = 0; } - else if (deltacleantime >= 1800) + else if (time >= 1800) { - Con_Printf("Host_Mingled: time stepped forward (went from %f to %f, difference %f)\n", olddirtytime, dirtytime, deltacleantime); - deltacleantime = 0; + Con_Printf(CON_WARN "Host_Mingled: time stepped forward (went from %f to %f, difference %f)\n", oldtime, newtime, time); + time = 0; } - realtime += deltacleantime; - host_dirtytime = dirtytime; + host.realtime += time; + host.dirtytime = newtime; - cl_timer += deltacleantime; - sv_timer += deltacleantime; + cl_timer += time; + sv_timer += time; if (!svs.threaded) { - svs.perf_acc_realtime += deltacleantime; + svs.perf_acc_realtime += time; // Look for clients who have spawned playing = false; for (i = 0, host_client = svs.clients;i < svs.maxclients;i++, host_client++) - if(host_client->spawned) + if(host_client->begun) if(host_client->netconnection) playing = true; if(sv.time < 10) @@ -735,20 +476,15 @@ void Host_Main(void) } } - if (slowmo.value < 0.00001 && slowmo.value != 0) - Cvar_SetValue("slowmo", 0); if (host_framerate.value < 0.00001 && host_framerate.value != 0) - Cvar_SetValue("host_framerate", 0); + Cvar_SetValueQuick(&host_framerate, 0); + + TaskQueue_Frame(false); // keep the random time dependent, but not when playing demos/benchmarking if(!*sv_random_seed.string && !cls.demoplayback) rand(); - // get new key events - Key_EventQueue_Unblock(); - SndSys_SendKeyEvents(); - Sys_SendKeyEvents(); - NetConn_UpdateSockets(); Log_DestBuffer_Flush(); @@ -763,17 +499,16 @@ void Host_Main(void) // check for commands typed to the host Host_GetConsoleCommands(); - // 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 client frames - if (sv.active ? sv_timer > 0 : cl_timer > 0) - { - // process console commands -// R_TimeReport("preconsole"); - CL_VM_PreventInformationLeaks(); - Cbuf_Frame(); -// R_TimeReport("console"); - } + // process console commands +// R_TimeReport("preconsole"); + CL_VM_PreventInformationLeaks(); + Cbuf_Frame(&cmd_client); + Cbuf_Frame(&cmd_server); + + if(sv.active) + Cbuf_Frame(&cmd_serverfromclient); + +// R_TimeReport("console"); //Con_Printf("%6.0f %6.0f\n", cl_timer * 1000000.0, sv_timer * 1000000.0); @@ -785,7 +520,7 @@ void Host_Main(void) else wait = max(cl_timer, sv_timer) * -1000000.0; - if (!cls.timedemo && wait >= 1) + if (!host.restless && wait >= 1) { double time0, delta; @@ -797,8 +532,12 @@ void Host_Main(void) wait = 1; // because we cast to int time0 = Sys_DirtyTime(); - if (sv_checkforpacketsduringsleep.integer && !sys_usenoclockbutbenchmark.integer && !svs.threaded) + if (sv_checkforpacketsduringsleep.integer && !sys_usenoclockbutbenchmark.integer && !svs.threaded) { NetConn_SleepMicroseconds((int)wait); + if (cls.state != ca_dedicated) + NetConn_ClientFrame(); // helps server browser get good ping values + // TODO can we do the same for ServerFrame? Probably not. + } else Sys_Sleep((int)wait); delta = Sys_DirtyTime() - time0; @@ -857,14 +596,14 @@ void Host_Main(void) framelimit = cl_maxphysicsframesperserverframe.integer; aborttime = Sys_DirtyTime() + 0.1; } - if(slowmo.value > 0 && slowmo.value < 1) - advancetime = min(advancetime, 0.1 / slowmo.value); + if(host_timescale.value > 0 && host_timescale.value < 1) + advancetime = min(advancetime, 0.1 / host_timescale.value); else advancetime = min(advancetime, 0.1); if(advancetime > 0) { - offset = Sys_DirtyTime() - dirtytime;if (offset < 0 || offset >= 1800) offset = 0; + offset = Sys_DirtyTime() - newtime;if (offset < 0 || offset >= 1800) offset = 0; offset += sv_timer; ++svs.perf_acc_offset_samples; svs.perf_acc_offset += offset; @@ -875,10 +614,10 @@ void Host_Main(void) // only advance time if not paused // the game also pauses in singleplayer when menu or console is used - sv.frametime = advancetime * slowmo.value; + sv.frametime = advancetime * host_timescale.value; if (host_framerate.value) sv.frametime = host_framerate.value; - if (sv.paused || (cl.islocalgame && (key_dest != key_game || key_consoleactive || cl.csqc_paused))) + if (sv.paused || host.paused) sv.frametime = 0; for (framecount = 0;framecount < framelimit && sv_timer > 0;framecount++) @@ -898,8 +637,8 @@ 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; + if (sv.paused == 1 && host.realtime > sv.pausedstart && sv.pausedstart > 0) { + prog->globals.fp[OFS_PARM0] = host.realtime - sv.pausedstart; PRVM_serverglobalfloat(time) = sv.time; prog->ExecuteProgram(prog, PRVM_serverfunction(SV_PausedTic), "QC function SV_PausedTic is missing"); } @@ -921,11 +660,17 @@ void Host_Main(void) // //------------------- + // get new key events + Key_EventQueue_Unblock(); + SndSys_SendKeyEvents(); + Sys_SendKeyEvents(); + if (cls.state != ca_dedicated && (cl_timer > 0 || cls.timedemo || ((vid_activewindow ? cl_maxfps : cl_maxidlefps).value < 1))) { R_TimeReport("---"); Collision_Cache_NewFrame(); - R_TimeReport("collisioncache"); + R_TimeReport("photoncache"); +#ifdef CONFIG_VIDEO_CAPTURE // decide the simulation time if (cls.capturevideo.active) { @@ -939,6 +684,10 @@ void Host_Main(void) } } else if (vid_activewindow && cl_maxfps.value >= 1 && !cls.timedemo) + +#else + if (vid_activewindow && cl_maxfps.value >= 1 && !cls.timedemo) +#endif { clframetime = cl.realframetime = max(cl_timer, 1.0 / cl_maxfps.value); // when running slow, we need to sleep to keep input responsive @@ -956,18 +705,20 @@ void Host_Main(void) // scale playback speed of demos by slowmo cvar if (cls.demoplayback) { - clframetime *= slowmo.value; + clframetime *= host_timescale.value; // if demo playback is paused, don't advance time at all if (cls.demopaused) clframetime = 0; } + else + { + // host_framerate overrides all else + if (host_framerate.value) + clframetime = host_framerate.value; - // host_framerate overrides all else - if (host_framerate.value) - clframetime = host_framerate.value; - - if (cl.paused || (cl.islocalgame && (key_dest != key_game || key_consoleactive || cl.csqc_paused))) - clframetime = 0; + if (cl.paused || host.paused) + clframetime = 0; + } if (cls.timedemo) clframetime = cl.realframetime = cl_timer; @@ -1056,8 +807,10 @@ void Host_Main(void) sv_timer = 0; } - host_framecount++; + host.framecount++; } + + Sys_Quit(0); } //============================================================================ @@ -1079,24 +832,26 @@ char engineversion[128]; qboolean sys_nostdout = false; -extern qboolean host_stuffcmdsrun; - static qfile_t *locksession_fh = NULL; static qboolean locksession_run = false; static void Host_InitSession(void) { int i; + char *buf; Cvar_RegisterVariable(&sessionid); Cvar_RegisterVariable(&locksession); // load the session ID into the read-only cvar - if ((i = COM_CheckParm("-sessionid")) && (i + 1 < com_argc)) + if ((i = COM_CheckParm("-sessionid")) && (i + 1 < sys.argc)) { - char vabuf[1024]; - if(com_argv[i+1][0] == '.') - Cvar_SetQuick(&sessionid, com_argv[i+1]); + if(sys.argv[i+1][0] == '.') + Cvar_SetQuick(&sessionid, sys.argv[i+1]); else - Cvar_SetQuick(&sessionid, va(vabuf, sizeof(vabuf), ".%s", com_argv[i+1])); + { + buf = (char *)Z_Malloc(strlen(sys.argv[i+1]) + 2); + dpsnprintf(buf, sizeof(buf), ".%s", sys.argv[i+1]); + Cvar_SetQuick(&sessionid, buf); + } } } void Host_LockSession(void) @@ -1104,7 +859,7 @@ void Host_LockSession(void) if(locksession_run) return; locksession_run = true; - if(locksession.integer != 0) + if(locksession.integer != 0 && !COM_CheckParm("-readonly")) { char vabuf[1024]; char *p = va(vabuf, sizeof(vabuf), "%slock%s", *fs_userdir ? fs_userdir : fs_basedir, sessionid.string); @@ -1115,7 +870,7 @@ void Host_LockSession(void) { if(locksession.integer == 2) { - Con_Printf("WARNING: session lock %s could not be acquired. Please run with -sessionid and an unique session name. Continuing anyway.\n", p); + Con_Printf(CON_WARN "WARNING: session lock %s could not be acquired. Please run with -sessionid and an unique session name. Continuing anyway.\n", p); } else { @@ -1150,19 +905,22 @@ static void Host_Init (void) int i; const char* os; char vabuf[1024]; + cmd_state_t *cmd = &cmd_client; + + host.state = host_init; if (COM_CheckParm("-profilegameonly")) Sys_AllowProfiling(false); - // LordHavoc: quake never seeded the random number generator before... heh + // LadyHavoc: quake never seeded the random number generator before... heh if (COM_CheckParm("-benchmark")) srand(0); // predictable random sequence for -benchmark else srand((unsigned int)time(NULL)); // FIXME: this is evil, but possibly temporary - // LordHavoc: doesn't seem very temporary... - // LordHavoc: made this a saved cvar + // LadyHavoc: doesn't seem very temporary... + // LadyHavoc: made this a saved cvar // COMMANDLINEOPTION: Console: -developer enables warnings and other notices (RECOMMENDED for mod developers) if (COM_CheckParm("-developer")) { @@ -1209,19 +967,11 @@ static void Host_Init (void) // initialize various cvars that could not be initialized earlier u8_Init(); Curl_Init_Commands(); - Cmd_Init_Commands(); Sys_Init_Commands(); COM_Init_Commands(); - FS_Init_Commands(); - - // initialize console window (only used by sys_win.c) - Sys_InitConsole(); - - // initialize the self-pack (must be before COM_InitGameType as it may add command line options) - FS_Init_SelfPack(); - // detect gamemode from commandline options or executable name - COM_InitGameType(); + // initialize filesystem (including fs_basedir, fs_gamedir, -game, scr_screenshot_name) + FS_Init(); // construct a version string for the corner of the console os = DP_OS_NAME; @@ -1234,9 +984,6 @@ static void Host_Init (void) // initialize ixtable Mathlib_Init(); - // initialize filesystem (including fs_basedir, fs_gamedir, -game, scr_screenshot_name) - FS_Init(); - // register the cvars for session locking Host_InitSession(); @@ -1246,36 +993,18 @@ static void Host_Init (void) NetConn_Init(); Curl_Init(); - //PR_Init(); - //PR_Cmd_Init(); PRVM_Init(); Mod_Init(); World_Init(); SV_Init(); V_Init(); // some cvars needed by server player physics (cl_rollangle etc) - Host_InitCommands(); Host_InitLocal(); Host_ServerOptions(); Thread_Init(); + TaskQueue_Init(); - 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"); - - R_Modules_Init(); - Palette_Init(); - MR_Init_Commands(); - VID_Shared_Init(); - VID_Init(); - Render_Init(); - S_Init(); - CDAudio_Init(); - Key_Init(); - CL_Init(); - } + CL_Init(); // save off current state of aliases, commands and cvars for later restore if FS_GameDir_f is called // NOTE: menu commands are freed by Cmd_RestoreInitState @@ -1285,74 +1014,80 @@ static void Host_Init (void) // without crashing the whole game, so this should just be a short-time solution // here comes the not so critical stuff - if (setjmp(host_abortframe)) { + if (setjmp(host.abortframe)) { return; } - Host_AddConfigText(); - Cbuf_Execute(); + Host_AddConfigText(cmd); + + Host_StartVideo(); - // if stuffcmds wasn't run, then quake.rc is probably missing, use default - if (!host_stuffcmdsrun) + // if quake.rc is missing, use default + if (!FS_FileExists("quake.rc")) { - Cbuf_AddText("exec default.cfg\nexec " CONFIGFILENAME "\nexec autoexec.cfg\nstuffcmds\n"); - Cbuf_Execute(); + Cbuf_InsertText(cmd, "exec default.cfg\nexec " CONFIGFILENAME "\nexec autoexec.cfg\n"); + Cbuf_Execute(cmd); } - // put up the loading image so the user doesn't stare at a black screen... - SCR_BeginLoadingPlaque(true); + host.state = host_active; - if (cls.state != ca_dedicated) - { - MR_Init(); - } + // run stuffcmds now, deferred previously because it can crash if a server starts that early + Cbuf_AddText(cmd,"stuffcmds\n"); + Cbuf_Execute(cmd); + + Log_Start(); + // put up the loading image so the user doesn't stare at a black screen... + SCR_BeginLoadingPlaque(true); + // check for special benchmark mode // COMMANDLINEOPTION: Client: -benchmark runs a timedemo and quits, results of any timedemo can be found in gamedir/benchmark.log (for example id1/benchmark.log) i = COM_CheckParm("-benchmark"); - if (i && i + 1 < com_argc) + if (i && i + 1 < sys.argc) if (!sv.active && !cls.demoplayback && !cls.connect_trying) { - Cbuf_AddText(va(vabuf, sizeof(vabuf), "timedemo %s\n", com_argv[i + 1])); - Cbuf_Execute(); + Cbuf_AddText(&cmd_client, va(vabuf, sizeof(vabuf), "timedemo %s\n", sys.argv[i + 1])); + Cbuf_Execute(&cmd_client); } // check for special demo mode // COMMANDLINEOPTION: Client: -demo runs a playdemo and quits i = COM_CheckParm("-demo"); - if (i && i + 1 < com_argc) + if (i && i + 1 < sys.argc) if (!sv.active && !cls.demoplayback && !cls.connect_trying) { - Cbuf_AddText(va(vabuf, sizeof(vabuf), "playdemo %s\n", com_argv[i + 1])); - Cbuf_Execute(); + Cbuf_AddText(&cmd_client, va(vabuf, sizeof(vabuf), "playdemo %s\n", sys.argv[i + 1])); + Cbuf_Execute(&cmd_client); } +#ifdef CONFIG_VIDEO_CAPTURE // COMMANDLINEOPTION: Client: -capturedemo captures a playdemo and quits i = COM_CheckParm("-capturedemo"); - if (i && i + 1 < com_argc) + if (i && i + 1 < sys.argc) if (!sv.active && !cls.demoplayback && !cls.connect_trying) { - Cbuf_AddText(va(vabuf, sizeof(vabuf), "playdemo %s\ncl_capturevideo 1\n", com_argv[i + 1])); - Cbuf_Execute(); + Cbuf_AddText(&cmd_client, va(vabuf, sizeof(vabuf), "playdemo %s\ncl_capturevideo 1\n", sys.argv[i + 1])); + Cbuf_Execute(&cmd_client); } +#endif if (cls.state == ca_dedicated || COM_CheckParm("-listen")) if (!sv.active && !cls.demoplayback && !cls.connect_trying) { - Cbuf_AddText("startmap_dm\n"); - Cbuf_Execute(); + Cbuf_AddText(&cmd_client, "startmap_dm\n"); + Cbuf_Execute(&cmd_client); } if (!sv.active && !cls.demoplayback && !cls.connect_trying) { - Cbuf_AddText("togglemenu 1\n"); - Cbuf_Execute(); +#ifdef CONFIG_MENU + Cbuf_AddText(&cmd_client, "togglemenu 1\n"); +#endif + Cbuf_Execute(&cmd_client); } Con_DPrint("========Initialized=========\n"); - //Host_StartVideo(); - if (cls.state != ca_dedicated) SV_StartThread(); } @@ -1375,7 +1110,7 @@ void Host_Shutdown(void) Con_Print("recursive shutdown\n"); return; } - if (setjmp(host_abortframe)) + if (setjmp(host.abortframe)) { Con_Print("aborted the quitting frame?!?\n"); return; @@ -1394,12 +1129,14 @@ void Host_Shutdown(void) // shut down local server if active SV_LockThreadMutex(); - Host_ShutdownServer (); + SV_Shutdown (); SV_UnlockThreadMutex(); +#ifdef CONFIG_MENU // Shutdown menu if(MR_Shutdown) MR_Shutdown(); +#endif // AK shutdown PRVM // AK hmm, no PRVM_Shutdown(); yet @@ -1412,7 +1149,6 @@ void Host_Shutdown(void) S_Terminate (); Curl_Shutdown (); NetConn_Shutdown (); - //PR_Shutdown (); if (cls.state != ca_dedicated) { @@ -1421,6 +1157,7 @@ void Host_Shutdown(void) } SV_StopThread(); + TaskQueue_Shutdown(); Thread_Shutdown(); Cmd_Shutdown(); Key_Shutdown(); @@ -1436,3 +1173,6 @@ void Host_Shutdown(void) Memory_Shutdown(); } +void Host_NoOperation_f(cmd_state_t *cmd) +{ +}