#include "sv_demo.h"
#include "snd_main.h"
#include "taskqueue.h"
-#include "thread.h"
#include "utf8lib.h"
/*
*/
-// how many frames have occurred
-// (checked by Host_Error and Host_SaveConfig_f)
-int host_framecount = 0;
+host_t host;
-// Cloudwalk: set when Host_Init is executed
-qboolean host_init = false;
-// LadyHavoc: set when quit is executed
-qboolean host_shuttingdown = false;
+// pretend frames take this amount of time (in seconds), 0 = realtime
+cvar_t host_framerate = {CF_CLIENT | CF_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 = {CF_CLIENT, "cl_maxphysicsframesperserverframe","10", "maximum number of physics frames per server frame"};
+// shows time used by certain subsystems
+cvar_t host_speeds = {CF_CLIENT | CF_SERVER, "host_speeds","0", "reports how much time is used in server/graphics/sound"};
+cvar_t host_maxwait = {CF_CLIENT | CF_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."};
-// 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;
+cvar_t developer = {CF_CLIENT | CF_SERVER | CF_ARCHIVE, "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 = {CF_CLIENT | CF_SERVER, "developer_extra", "0", "prints additional debugging messages, often very verbose!"};
+cvar_t developer_insane = {CF_CLIENT | CF_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 = {CF_CLIENT | CF_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 = {CF_CLIENT | CF_SERVER, "developer_loading","0", "prints information about files as they are loaded or unloaded successfully"};
+cvar_t developer_entityparsing = {CF_CLIENT, "developer_entityparsing", "0", "prints detailed network entities information each time a packet is received"};
-// current client
-client_t *host_client;
+cvar_t timestamps = {CF_CLIENT | CF_SERVER | CF_ARCHIVE, "timestamps", "0", "prints timestamps on console messages"};
+cvar_t timeformat = {CF_CLIENT | CF_SERVER | CF_ARCHIVE, "timeformat", "[%Y-%m-%d %H:%M:%S] ", "time format to use on timestamped console messages"};
-jmp_buf host_abortframe;
+cvar_t sessionid = {CF_CLIENT | CF_SERVER | CF_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 = {CF_CLIENT | CF_SERVER, "locksession", "0", "Lock the session? 0 = no, 1 = yes and abort on failure, 2 = yes and continue on failure"};
-// pretend frames take this amount of time (in seconds), 0 = realtime
-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 = {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"};
+cvar_t host_isclient = {CF_SHARED | CF_READONLY, "_host_isclient", "0", "If 1, clientside is active."};
/*
================
// in case we were previously nice, make us mean again
Sys_MakeProcessMean();
- longjmp (host_abortframe, 1);
+ longjmp (host.abortframe, 1);
}
/*
{
static char hosterrorstring1[MAX_INPUTLINE]; // THREAD UNSAFE
static char hosterrorstring2[MAX_INPUTLINE]; // THREAD UNSAFE
- static qboolean hosterror = false;
+ static qbool hosterror = false;
va_list argptr;
// turn off rcon redirect if it was active when the crash occurred
dpvsnprintf (hosterrorstring1,sizeof(hosterrorstring1),error,argptr);
va_end (argptr);
- Con_Errorf("Host_Error: %s\n", hosterrorstring1);
+ Con_Printf(CON_ERROR "Host_Error: %s\n", hosterrorstring1);
// 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)
Cvar_SetValueQuick(&csqc_progsize, -1);
SV_LockThreadMutex();
- Host_ShutdownServer ();
+ SV_Shutdown ();
SV_UnlockThreadMutex();
if (cls.state == ca_dedicated)
// COMMANDLINEOPTION: Server: -listen [playerlimit] starts a multiplayer server with graphical client, like singleplayer but other players can connect, default playerlimit is 8
// if no client is in the executable or -dedicated is specified on
// commandline, start a dedicated server
- i = COM_CheckParm ("-dedicated");
+ i = Sys_CheckParm ("-dedicated");
if (i || !cl_available)
{
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 (COM_CheckParm ("-listen"))
+ if (i && i + 1 < sys.argc && atoi (sys.argv[i+1]) >= 1)
+ svs.maxclients = atoi (sys.argv[i+1]);
+ if (Sys_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(&cvars_all, "sv_public", 1);
{
// client exists and not dedicated, check if -listen is specified
cls.state = ca_disconnected;
- i = COM_CheckParm ("-listen");
+ i = Sys_CheckParm ("-listen");
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
{
Cvar_SetValueQuick(&deathmatch, 1);
}
+/*
+==================
+Host_Quit_f
+==================
+*/
+static 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);
+}
+
+static void Host_Framerate_c(cvar_t *var)
+{
+ if (var->value < 0.00001 && var->value != 0)
+ Cvar_SetValueQuick(var, 0);
+}
+
/*
=======================
Host_InitLocal
extern cvar_t r_texture_jpeg_fastpicmip;
static void Host_InitLocal (void)
{
- Cmd_AddCommand(&cmd_client, "saveconfig", Host_SaveConfig_f, "save settings to config.cfg (or a specified filename) immediately (also automatic when quitting)");
- Cmd_AddCommand(&cmd_client, "loadconfig", Host_LoadConfig_f, "reset everything and reload configs");
- Cmd_AddCommand(&cmd_server, "saveconfig", Host_SaveConfig_f, "save settings to config.cfg (or a specified filename) immediately (also automatic when quitting)");
- Cmd_AddCommand(&cmd_server, "loadconfig", Host_LoadConfig_f, "reset everything and reload configs");
-
+ Cmd_AddCommand(CF_SHARED, "quit", Host_Quit_f, "quit the game");
+ Cmd_AddCommand(CF_SHARED, "version", Host_Version_f, "print engine version");
+ Cmd_AddCommand(CF_SHARED, "saveconfig", Host_SaveConfig_f, "save settings to config.cfg (or a specified filename) immediately (also automatic when quitting)");
+ Cmd_AddCommand(CF_SHARED, "loadconfig", Host_LoadConfig_f, "reset everything and reload configs");
Cvar_RegisterVariable (&cl_maxphysicsframesperserverframe);
Cvar_RegisterVariable (&host_framerate);
+ Cvar_RegisterCallback (&host_framerate, Host_Framerate_c);
Cvar_RegisterVariable (&host_speeds);
Cvar_RegisterVariable (&host_maxwait);
- Cvar_RegisterVariable (&cl_minfps);
- Cvar_RegisterVariable (&cl_minfps_fade);
- Cvar_RegisterVariable (&cl_minfps_qualitymax);
- Cvar_RegisterVariable (&cl_minfps_qualitymin);
- Cvar_RegisterVariable (&cl_minfps_qualitystepmax);
- Cvar_RegisterVariable (&cl_minfps_qualityhysteresis);
- Cvar_RegisterVariable (&cl_minfps_qualitymultiply);
- Cvar_RegisterVariable (&cl_minfps_force);
- Cvar_RegisterVariable (&cl_maxfps);
- Cvar_RegisterVariable (&cl_maxfps_alwayssleep);
- Cvar_RegisterVariable (&cl_maxidlefps);
+ Cvar_RegisterVariable (&host_isclient);
Cvar_RegisterVariable (&developer);
Cvar_RegisterVariable (&developer_extra);
// dedicated servers initialize the host but don't parse and set the
// config.cfg cvars
// 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"))
+ if (host.framecount >= 3 && cls.state != ca_dedicated && !Sys_CheckParm("-benchmark") && !Sys_CheckParm("-capturedemo"))
{
f = FS_OpenRealFile(file, "wb", false);
if (!f)
{
- Con_Errorf("Couldn't write %s.\n", file);
+ Con_Printf(CON_ERROR "Couldn't write %s.\n", file);
return;
}
Cbuf_InsertText(cmd, "alias startmap_sp \"map start\"\nalias startmap_dm \"map start\"\nexec teu.rc\n");
else
Cbuf_InsertText(cmd, "alias startmap_sp \"map start\"\nalias startmap_dm \"map start\"\nexec " STARTCONFIGFILENAME "\n");
- Cbuf_Execute(cmd);
+ Cbuf_Execute(cmd->cbuf);
}
/*
Host_AddConfigText(&cmd_client);
}
-/*
-=================
-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_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)
- {
- // LadyHavoc: 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, 0, false);
- NetConn_SendUnreliableMessage(host_client->netconnection, &buf, sv.protocol, 10000, 0, false);
- NetConn_SendUnreliableMessage(host_client->netconnection, &buf, sv.protocol, 10000, 0, false);
- }
- }
-
- // call qc ClientDisconnect function
- // LadyHavoc: 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;
-}
-
-
//============================================================================
/*
==================
*/
static void Host_Init(void);
-void Host_Main(void)
+double Host_Frame(double time)
{
- double time1 = 0;
- double time2 = 0;
- double time3 = 0;
- double cl_timer = 0, sv_timer = 0;
- double clframetime, deltacleantime, olddirtytime, dirtytime;
- double wait;
- int pass1, pass2, pass3, i;
- char vabuf[1024];
- qboolean playing;
+ double cl_timer = 0;
+ double sv_timer = 0;
+ static double wait;
- Host_Init();
+ TaskQueue_Frame(false);
- realtime = 0;
- host_dirtytime = Sys_DirtyTime();
- for (;;)
- {
- if (setjmp(host_abortframe))
- {
- SCR_ClearLoadingScreen(false);
- continue; // something bad happened, or the server disconnected
- }
+ // keep the random time dependent, but not when playing demos/benchmarking
+ if(!*sv_random_seed.string && !host.restless)
+ rand();
- olddirtytime = host_dirtytime;
- dirtytime = Sys_DirtyTime();
- deltacleantime = dirtytime - olddirtytime;
- if (deltacleantime < 0)
- {
- // warn if it's significant
- if (deltacleantime < -0.01)
- Con_Warnf("Host_Mingled: time stepped backwards (went from %f to %f, difference %f)\n", olddirtytime, dirtytime, deltacleantime);
- deltacleantime = 0;
- }
- else if (deltacleantime >= 1800)
- {
- Con_Warnf("Host_Mingled: time stepped forward (went from %f to %f, difference %f)\n", olddirtytime, dirtytime, deltacleantime);
- deltacleantime = 0;
- }
- realtime += deltacleantime;
- host_dirtytime = dirtytime;
+ NetConn_UpdateSockets();
- cl_timer += deltacleantime;
- sv_timer += deltacleantime;
+ Log_DestBuffer_Flush();
- if (!svs.threaded)
- {
- svs.perf_acc_realtime += deltacleantime;
-
- // Look for clients who have spawned
- playing = false;
- for (i = 0, host_client = svs.clients;i < svs.maxclients;i++, host_client++)
- if(host_client->begun)
- if(host_client->netconnection)
- playing = true;
- if(sv.time < 10)
- {
- // don't accumulate time for the first 10 seconds of a match
- // so things can settle
- svs.perf_acc_realtime = svs.perf_acc_sleeptime = svs.perf_acc_lost = svs.perf_acc_offset = svs.perf_acc_offset_squared = svs.perf_acc_offset_max = svs.perf_acc_offset_samples = 0;
- }
- else if(svs.perf_acc_realtime > 5)
- {
- svs.perf_cpuload = 1 - svs.perf_acc_sleeptime / svs.perf_acc_realtime;
- svs.perf_lost = svs.perf_acc_lost / svs.perf_acc_realtime;
- if(svs.perf_acc_offset_samples > 0)
- {
- svs.perf_offset_max = svs.perf_acc_offset_max;
- svs.perf_offset_avg = svs.perf_acc_offset / svs.perf_acc_offset_samples;
- svs.perf_offset_sdev = sqrt(svs.perf_acc_offset_squared / svs.perf_acc_offset_samples - svs.perf_offset_avg * svs.perf_offset_avg);
- }
- if(svs.perf_lost > 0 && developer_extra.integer)
- if(playing) // only complain if anyone is looking
- Con_DPrintf("Server can't keep up: %s\n", Host_TimingReport(vabuf, sizeof(vabuf)));
- svs.perf_acc_realtime = svs.perf_acc_sleeptime = svs.perf_acc_lost = svs.perf_acc_offset = svs.perf_acc_offset_squared = svs.perf_acc_offset_max = svs.perf_acc_offset_samples = 0;
- }
- }
+ Curl_Run();
- if (host_framerate.value < 0.00001 && host_framerate.value != 0)
- Cvar_SetValueQuick(&host_framerate, 0);
+ // check for commands typed to the host
+ Host_GetConsoleCommands();
- TaskQueue_Frame(false);
+ // process console commands
+// R_TimeReport("preconsole");
- // keep the random time dependent, but not when playing demos/benchmarking
- if(!*sv_random_seed.string && !cls.demoplayback)
- rand();
+ Cbuf_Frame(host.cbuf);
- // get new key events
- Key_EventQueue_Unblock();
- SndSys_SendKeyEvents();
- Sys_SendKeyEvents();
+// R_TimeReport("console");
- NetConn_UpdateSockets();
+ //Con_Printf("%6.0f %6.0f\n", cl_timer * 1000000.0, sv_timer * 1000000.0);
- Log_DestBuffer_Flush();
+ R_TimeReport("---");
- // receive packets on each main loop iteration, as the main loop may
- // be undersleeping due to select() detecting a new packet
- if (sv.active && !svs.threaded)
- NetConn_ServerFrame();
+ sv_timer = SV_Frame(time);
+ cl_timer = CL_Frame(time);
- Curl_Run();
+ Mem_CheckSentinelsGlobal();
- // 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(&cmd_client);
- Cbuf_Frame(&cmd_server);
-
- if(sv.active)
- {
- Cbuf_Frame(&cmd_serverfromclient);
- }
-
-// R_TimeReport("console");
- }
+ // if the accumulators haven't become positive yet, wait a while
+ if (cls.state == ca_dedicated)
+ wait = sv_timer * -1000000.0; // dedicated
+ else if (!sv.active || svs.threaded)
+ wait = cl_timer * -1000000.0; // connected to server, main menu, or server is on different thread
+ else
+ wait = max(cl_timer, sv_timer) * -1000000.0; // listen server or singleplayer
- //Con_Printf("%6.0f %6.0f\n", cl_timer * 1000000.0, sv_timer * 1000000.0);
+ if (!host.restless && wait >= 1)
+ return wait;
+ else
+ return 0;
+}
- // if the accumulators haven't become positive yet, wait a while
- if (cls.state == ca_dedicated)
- wait = sv_timer * -1000000.0;
- else if (!sv.active || svs.threaded)
- wait = cl_timer * -1000000.0;
- else
- wait = max(cl_timer, sv_timer) * -1000000.0;
+static inline void Host_Sleep(double time)
+{
+ static double delta;
+ double time0;
- if (!cls.timedemo && wait >= 1)
- {
- double time0, delta;
+ if(host_maxwait.value <= 0)
+ time = min(time, 1000000.0);
+ else
+ time = min(time, host_maxwait.value * 1000.0);
+ if(time < 1)
+ time = 1; // because we cast to int
- if(host_maxwait.value <= 0)
- wait = min(wait, 1000000.0);
- else
- wait = min(wait, host_maxwait.value * 1000.0);
- if(wait < 1)
- wait = 1; // because we cast to int
-
- time0 = Sys_DirtyTime();
- 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;
- if (delta < 0 || delta >= 1800) delta = 0;
- if (!svs.threaded)
- svs.perf_acc_sleeptime += delta;
+ time0 = Sys_DirtyTime();
+ if (sv_checkforpacketsduringsleep.integer && !sys_usenoclockbutbenchmark.integer && !svs.threaded) {
+ NetConn_SleepMicroseconds((int)time);
+ 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)time);
+ delta = Sys_DirtyTime() - time0;
+ if (delta < 0 || delta >= 1800)
+ delta = 0;
+ host.sleeptime += delta;
// R_TimeReport("sleep");
- continue;
- }
-
- // limit the frametime steps to no more than 100ms each
- if (cl_timer > 0.1)
- cl_timer = 0.1;
- if (sv_timer > 0.1)
- {
- if (!svs.threaded)
- svs.perf_acc_lost += (sv_timer - 0.1);
- sv_timer = 0.1;
- }
-
- R_TimeReport("---");
-
- //-------------------
- //
- // server operations
- //
- //-------------------
-
- // limit the frametime steps to no more than 100ms each
- if (sv.active && sv_timer > 0 && !svs.threaded)
- {
- // execute one or more server frames, with an upper limit on how much
- // execution time to spend on server frames to avoid freezing the game if
- // the server is overloaded, this execution time limit means the game will
- // slow down if the server is taking too long.
- int framecount, framelimit = 1;
- double advancetime, aborttime = 0;
- float offset;
- prvm_prog_t *prog = SVVM_prog;
-
- // run the world state
- // don't allow simulation to run too fast or too slow or logic glitches can occur
-
- // stop running server frames if the wall time reaches this value
- if (sys_ticrate.value <= 0)
- advancetime = sv_timer;
- else if (cl.islocalgame && !sv_fixedframeratesingleplayer.integer)
- {
- // synchronize to the client frametime, but no less than 10ms and no more than 100ms
- advancetime = bound(0.01, cl_timer, 0.1);
- }
- else
- {
- advancetime = sys_ticrate.value;
- // listen servers can run multiple server frames per client frame
- framelimit = cl_maxphysicsframesperserverframe.integer;
- aborttime = Sys_DirtyTime() + 0.1;
- }
- 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 += sv_timer;
- ++svs.perf_acc_offset_samples;
- svs.perf_acc_offset += offset;
- svs.perf_acc_offset_squared += offset * offset;
- if(svs.perf_acc_offset_max < offset)
- svs.perf_acc_offset_max = offset;
- }
+ return;
+}
- // only advance time if not paused
- // the game also pauses in singleplayer when menu or console is used
- 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)))
- sv.frametime = 0;
+// Cloudwalk: Most overpowered function declaration...
+static inline double Host_UpdateTime (double newtime, double oldtime)
+{
+ double time = newtime - oldtime;
- for (framecount = 0;framecount < framelimit && sv_timer > 0;framecount++)
- {
- sv_timer -= advancetime;
+ if (time < 0)
+ {
+ // warn if it's significant
+ if (time < -0.01)
+ Con_Printf(CON_WARN "Host_UpdateTime: time stepped backwards (went from %f to %f, difference %f)\n", oldtime, newtime, time);
+ time = 0;
+ }
+ else if (time >= 1800)
+ {
+ Con_Printf(CON_WARN "Host_UpdateTime: time stepped forward (went from %f to %f, difference %f)\n", oldtime, newtime, time);
+ time = 0;
+ }
- // move things around and think unless paused
- if (sv.frametime)
- SV_Physics();
+ return time;
+}
- // if this server frame took too long, break out of the loop
- if (framelimit > 1 && Sys_DirtyTime() >= aborttime)
- break;
- }
- R_TimeReport("serverphysics");
+void Host_Main(void)
+{
+ double time, newtime, oldtime, sleeptime;
- // send all messages to the clients
- SV_SendClientMessages();
+ Host_Init(); // Start!
- if (sv.paused == 1 && realtime > sv.pausedstart && sv.pausedstart > 0) {
- prog->globals.fp[OFS_PARM0] = realtime - sv.pausedstart;
- PRVM_serverglobalfloat(time) = sv.time;
- prog->ExecuteProgram(prog, PRVM_serverfunction(SV_PausedTic), "QC function SV_PausedTic is missing");
- }
+ host.realtime = 0;
+ oldtime = Sys_DirtyTime();
- // send an heartbeat if enough time has passed since the last one
- NetConn_Heartbeat(0);
- R_TimeReport("servernetwork");
- }
- else if (!svs.threaded)
+ // Main event loop
+ while(host.state != host_shutdown)
+ {
+ // Something bad happened, or the server disconnected
+ if (setjmp(host.abortframe))
{
- // don't let r_speeds display jump around
- R_TimeReport("serverphysics");
- R_TimeReport("servernetwork");
+ host.state = host_active; // In case we were loading
+ continue;
}
- //-------------------
- //
- // client operations
- //
- //-------------------
-
- 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("photoncache");
- // decide the simulation time
- if (cls.capturevideo.active)
- {
- //***
- if (cls.capturevideo.realtime)
- clframetime = cl.realframetime = max(cl_timer, 1.0 / cls.capturevideo.framerate);
- else
- {
- clframetime = 1.0 / cls.capturevideo.framerate;
- cl.realframetime = max(cl_timer, clframetime);
- }
- }
- else if (vid_activewindow && cl_maxfps.value >= 1 && !cls.timedemo)
- {
- clframetime = cl.realframetime = max(cl_timer, 1.0 / cl_maxfps.value);
- // when running slow, we need to sleep to keep input responsive
- wait = bound(0, cl_maxfps_alwayssleep.value * 1000, 100000);
- if (wait > 0)
- Sys_Sleep((int)wait);
- }
- else if (!vid_activewindow && cl_maxidlefps.value >= 1 && !cls.timedemo)
- clframetime = cl.realframetime = max(cl_timer, 1.0 / cl_maxidlefps.value);
- else
- clframetime = cl.realframetime = cl_timer;
-
- // apply slowmo scaling
- clframetime *= cl.movevars_timescale;
- // scale playback speed of demos by slowmo cvar
- if (cls.demoplayback)
- {
- 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;
-
- if (cl.paused || (cl.islocalgame && (key_dest != key_game || key_consoleactive || cl.csqc_paused)))
- clframetime = 0;
- }
-
- if (cls.timedemo)
- clframetime = cl.realframetime = cl_timer;
-
- // deduct the frame time from the accumulator
- cl_timer -= cl.realframetime;
-
- cl.oldtime = cl.time;
- cl.time += clframetime;
-
- // update video
- if (host_speeds.integer)
- time1 = Sys_DirtyTime();
- R_TimeReport("pre-input");
-
- // Collect input into cmd
- CL_Input();
-
- R_TimeReport("input");
-
- // check for new packets
- NetConn_ClientFrame();
-
- // read a new frame from a demo if needed
- CL_ReadDemoMessage();
- R_TimeReport("clientnetwork");
-
- // now that packets have been read, send input to server
- CL_SendMove();
- R_TimeReport("sendmove");
-
- // update client world (interpolate entities, create trails, etc)
- CL_UpdateWorld();
- R_TimeReport("lerpworld");
-
- CL_Video_Frame();
+ newtime = host.dirtytime = Sys_DirtyTime();
+ host.realtime += time = Host_UpdateTime(newtime, oldtime);
- R_TimeReport("client");
+ sleeptime = Host_Frame(time);
+ oldtime = newtime;
- CL_UpdateScreen();
- R_TimeReport("render");
-
- if (host_speeds.integer)
- time2 = Sys_DirtyTime();
-
- // update audio
- if(cl.csqc_usecsqclistener)
- {
- S_Update(&cl.csqc_listenermatrix);
- cl.csqc_usecsqclistener = false;
- }
- else
- S_Update(&r_refdef.view.matrix);
-
- CDAudio_Update();
- R_TimeReport("audio");
-
- // reset gathering of mouse input
- in_mouse_x = in_mouse_y = 0;
-
- if (host_speeds.integer)
- {
- pass1 = (int)((time1 - time3)*1000000);
- time3 = Sys_DirtyTime();
- pass2 = (int)((time2 - time1)*1000000);
- pass3 = (int)((time3 - time2)*1000000);
- Con_Printf("%6ius total %6ius server %6ius gfx %6ius snd\n",
- pass1+pass2+pass3, pass1, pass2, pass3);
- }
- }
-
-#if MEMPARANOIA
- Mem_CheckSentinelsGlobal();
-#else
- if (developer_memorydebug.integer)
- Mem_CheckSentinelsGlobal();
-#endif
-
- // if there is some time remaining from this frame, reset the timers
- if (cl_timer >= 0)
- cl_timer = 0;
- if (sv_timer >= 0)
+ if (sleeptime)
{
- if (!svs.threaded)
- svs.perf_acc_lost += sv_timer;
- sv_timer = 0;
+ Host_Sleep(sleeptime);
+ continue;
}
- host_framecount++;
+ host.framecount++;
}
+
+ return;
}
//============================================================================
-qboolean vid_opened = false;
+qbool vid_opened = false;
void Host_StartVideo(void)
{
if (!vid_opened && cls.state != ca_dedicated)
{
vid_opened = true;
+#ifdef WIN32
// 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();
+#endif
VID_Start();
CDAudio_Startup();
}
char engineversion[128];
-qboolean sys_nostdout = false;
+qbool sys_nostdout = false;
static qfile_t *locksession_fh = NULL;
-static qboolean locksession_run = false;
+static qbool locksession_run = false;
static void Host_InitSession(void)
{
int i;
Cvar_RegisterVariable(&locksession);
// load the session ID into the read-only cvar
- if ((i = COM_CheckParm("-sessionid")) && (i + 1 < com_argc))
+ if ((i = Sys_CheckParm("-sessionid")) && (i + 1 < sys.argc))
{
- 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
{
- buf = (char *)Z_Malloc(strlen(com_argv[i+1]) + 2);
- dpsnprintf(buf, sizeof(buf), ".%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);
}
}
if(locksession_run)
return;
locksession_run = true;
- if(locksession.integer != 0 && !COM_CheckParm("-readonly"))
+ if(locksession.integer != 0 && !Sys_CheckParm("-readonly"))
{
char vabuf[1024];
char *p = va(vabuf, sizeof(vabuf), "%slock%s", *fs_userdir ? fs_userdir : fs_basedir, sessionid.string);
{
if(locksession.integer == 2)
{
- Con_Warnf("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
{
int i;
const char* os;
char vabuf[1024];
- qboolean dedicated_server = COM_CheckParm("-dedicated") || !cl_available;
cmd_state_t *cmd = &cmd_client;
- host_init = true;
+ host.state = host_init;
- if (COM_CheckParm("-profilegameonly"))
+ if (setjmp(host.abortframe)) // Huh?!
+ Sys_Error("Engine initialization failed. Check the console (if available) for additional information.\n");
+
+ if (Sys_CheckParm("-profilegameonly"))
Sys_AllowProfiling(false);
// LadyHavoc: quake never seeded the random number generator before... heh
- if (COM_CheckParm("-benchmark"))
+ if (Sys_CheckParm("-benchmark"))
srand(0); // predictable random sequence for -benchmark
else
srand((unsigned int)time(NULL));
// 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"))
+ if (Sys_CheckParm("-developer"))
{
developer.value = developer.integer = 1;
developer.string = "1";
}
- if (COM_CheckParm("-developer2") || COM_CheckParm("-developer3"))
+ if (Sys_CheckParm("-developer2") || Sys_CheckParm("-developer3"))
{
developer.value = developer.integer = 1;
developer.string = "1";
developer_memorydebug.string = "1";
}
- if (COM_CheckParm("-developer3"))
+ if (Sys_CheckParm("-developer3"))
{
gl_paranoid.integer = 1;gl_paranoid.string = "1";
gl_printcheckerror.integer = 1;gl_printcheckerror.string = "1";
}
// COMMANDLINEOPTION: Console: -nostdout disables text output to the terminal the game was launched from
- if (COM_CheckParm("-nostdout"))
+ if (Sys_CheckParm("-nostdout"))
sys_nostdout = 1;
- // used by everything
- Memory_Init();
-
// initialize console command/cvar/alias/command execution systems
Cmd_Init();
- Cmd_Init_Commands(dedicated_server);
-
// initialize memory subsystem cvars/commands
Memory_Init_Commands();
Curl_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;
// 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();
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();
// 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)) {
- return;
- }
Host_AddConfigText(cmd);
- Host_StartVideo();
-
// if quake.rc is missing, use default
if (!FS_FileExists("quake.rc"))
{
Cbuf_AddText(cmd, "exec default.cfg\nexec " CONFIGFILENAME "\nexec autoexec.cfg\n");
- Cbuf_Execute(cmd);
+ Cbuf_Execute(cmd->cbuf);
}
- host_init = false;
+ host.state = host_active;
- // run stuffcmds now, deferred previously because it can crash if a server starts that early
- Cbuf_AddText(cmd,"stuffcmds\n");
- Cbuf_Execute(cmd);
+ Host_StartVideo();
Log_Start();
-
+
// put up the loading image so the user doesn't stare at a black screen...
SCR_BeginLoadingPlaque(true);
-
#ifdef CONFIG_MENU
if (cls.state != ca_dedicated)
- {
MR_Init();
- }
#endif
-
// check for special benchmark mode
// COMMANDLINEOPTION: Client: -benchmark <demoname> 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)
+ i = Sys_CheckParm("-benchmark");
+ if (i && i + 1 < sys.argc)
if (!sv.active && !cls.demoplayback && !cls.connect_trying)
{
- Cbuf_AddText(&cmd_client, va(vabuf, sizeof(vabuf), "timedemo %s\n", com_argv[i + 1]));
- Cbuf_Execute(&cmd_client);
+ Cbuf_AddText(&cmd_client, va(vabuf, sizeof(vabuf), "timedemo %s\n", sys.argv[i + 1]));
+ Cbuf_Execute((&cmd_client)->cbuf);
}
// check for special demo mode
// COMMANDLINEOPTION: Client: -demo <demoname> runs a playdemo and quits
- i = COM_CheckParm("-demo");
- if (i && i + 1 < com_argc)
+ i = Sys_CheckParm("-demo");
+ if (i && i + 1 < sys.argc)
if (!sv.active && !cls.demoplayback && !cls.connect_trying)
{
- Cbuf_AddText(&cmd_client, va(vabuf, sizeof(vabuf), "playdemo %s\n", com_argv[i + 1]));
- Cbuf_Execute(&cmd_client);
+ Cbuf_AddText(&cmd_client, va(vabuf, sizeof(vabuf), "playdemo %s\n", sys.argv[i + 1]));
+ Cbuf_Execute((&cmd_client)->cbuf);
}
+#ifdef CONFIG_VIDEO_CAPTURE
// COMMANDLINEOPTION: Client: -capturedemo <demoname> captures a playdemo and quits
- i = COM_CheckParm("-capturedemo");
- if (i && i + 1 < com_argc)
+ i = Sys_CheckParm("-capturedemo");
+ if (i && i + 1 < sys.argc)
if (!sv.active && !cls.demoplayback && !cls.connect_trying)
{
- Cbuf_AddText(&cmd_client, va(vabuf, sizeof(vabuf), "playdemo %s\ncl_capturevideo 1\n", com_argv[i + 1]));
- Cbuf_Execute(&cmd_client);
+ Cbuf_AddText(&cmd_client, va(vabuf, sizeof(vabuf), "playdemo %s\ncl_capturevideo 1\n", sys.argv[i + 1]));
+ Cbuf_Execute((&cmd_client)->cbuf);
}
+#endif
- if (cls.state == ca_dedicated || COM_CheckParm("-listen"))
+ if (cls.state == ca_dedicated || Sys_CheckParm("-listen"))
if (!sv.active && !cls.demoplayback && !cls.connect_trying)
{
Cbuf_AddText(&cmd_client, "startmap_dm\n");
- Cbuf_Execute(&cmd_client);
+ Cbuf_Execute((&cmd_client)->cbuf);
}
if (!sv.active && !cls.demoplayback && !cls.connect_trying)
#ifdef CONFIG_MENU
Cbuf_AddText(&cmd_client, "togglemenu 1\n");
#endif
- Cbuf_Execute(&cmd_client);
+ Cbuf_Execute((&cmd_client)->cbuf);
}
Con_DPrint("========Initialized=========\n");
- //Host_StartVideo();
-
if (cls.state != ca_dedicated)
SV_StartThread();
}
*/
void Host_Shutdown(void)
{
- static qboolean isdown = false;
+ static qbool isdown = false;
if (isdown)
{
Con_Print("recursive shutdown\n");
return;
}
- if (setjmp(host_abortframe))
+ if (setjmp(host.abortframe))
{
Con_Print("aborted the quitting frame?!?\n");
return;
}
isdown = true;
- // be quiet while shutting down
- S_StopAllSounds();
+ if(cls.state != ca_dedicated)
+ CL_Shutdown();
// end the server thread
if (svs.threaded)
SV_StopThread();
- // disconnect client from server if active
- CL_Disconnect();
-
// 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
- CL_Video_Shutdown();
-
Host_SaveConfig();
- CDAudio_Shutdown ();
- S_Terminate ();
Curl_Shutdown ();
NetConn_Shutdown ();
- //PR_Shutdown ();
-
- if (cls.state != ca_dedicated)
- {
- R_Modules_Shutdown();
- VID_Shutdown();
- }
SV_StopThread();
TaskQueue_Shutdown();
Thread_Shutdown();
Cmd_Shutdown();
- Key_Shutdown();
- CL_Shutdown();
Sys_Shutdown();
Log_Close();
Crypto_Shutdown();
Host_UnlockSession();
- S_Shutdown();
Con_Shutdown();
Memory_Shutdown();
}
+void Host_NoOperation_f(cmd_state_t *cmd)
+{
+}