*/
// host.c -- coordinates spawning and killing of local servers
-#include <time.h>
#include "quakedef.h"
+
+#include <time.h>
#include "libcurl.h"
#include "cdaudio.h"
+#include "cl_gecko.h"
#include "cl_video.h"
#include "progsvm.h"
#include "csprogs.h"
+#include "sv_demo.h"
/*
jmp_buf host_abortframe;
// 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 host_maxfps if you want to limit your framerate instead, or sys_ticrate to limit server speed"};
+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"};
// shows time used by certain subsystems
cvar_t host_speeds = {0, "host_speeds","0", "reports how much time is used in server/graphics/sound"};
-// LordHavoc: framerate independent slowmo
-cvar_t slowmo = {0, "slowmo", "1.0", "controls game speed, 0.5 is half speed, 2 is double speed"};
// LordHavoc: framerate upper cap
-cvar_t cl_maxfps = {CVAR_SAVE, "cl_maxfps", "1000", "maximum fps cap, if game is running faster than this it will wait before running another frame (useful to make cpu time available to other programs)"};
-
-// print broadcast messages in dedicated mode
-cvar_t sv_echobprint = {CVAR_SAVE, "sv_echobprint", "1", "prints gamecode bprint() calls to server console"};
-
-cvar_t sys_ticrate = {CVAR_SAVE, "sys_ticrate","0.05", "how long a server frame is in seconds, 0.05 is 20fps server rate, 0.1 is 10fps (can not be set higher than 0.1), 0 runs as many server frames as possible (makes games against bots a little smoother, overwhelms network players)"};
-cvar_t sv_fixedframeratesingleplayer = {0, "sv_fixedframeratesingleplayer", "0", "allows you to use server-style timing system in singleplayer (don't run faster than sys_ticrate)"};
-
-cvar_t fraglimit = {CVAR_NOTIFY, "fraglimit","0", "ends level if this many frags is reached by any player"};
-cvar_t timelimit = {CVAR_NOTIFY, "timelimit","0", "ends level at this time (in minutes)"};
-cvar_t teamplay = {CVAR_NOTIFY, "teamplay","0", "teamplay mode, values depend on mod but typically 0 = no teams, 1 = no team damage no self damage, 2 = team damage and self damage, some mods support 3 = no team damage but can damage self"};
-
-cvar_t samelevel = {CVAR_NOTIFY, "samelevel","0", "repeats same level if level ends (due to timelimit or someone hitting an exit)"};
-cvar_t noexit = {CVAR_NOTIFY, "noexit","0", "kills anyone attempting to use an exit"};
+cvar_t cl_maxfps = {CVAR_SAVE, "cl_maxfps", "1000000", "maximum fps cap, 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_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 = {0, "developer","0", "prints additional debugging messages and information (recommended for modders and level designers)"};
cvar_t developer_entityparsing = {0, "developer_entityparsing", "0", "prints detailed network entities information each time a packet is received"};
-cvar_t skill = {0, "skill","1", "difficulty level of game, affects monster layouts in levels, 0 = easy, 1 = normal, 2 = hard, 3 = nightmare (same layout as hard but monsters fire twice)"};
-cvar_t deathmatch = {0, "deathmatch","0", "deathmatch mode, values depend on mod but typically 0 = no deathmatch, 1 = normal deathmatch with respawning weapons, 2 = weapons stay (players can only pick up new weapons)"};
-cvar_t coop = {0, "coop","0", "coop mode, 0 = no coop, 1 = coop mode, multiple players playing through the singleplayer game (coop mode also shuts off deathmatch)"};
-
-cvar_t pausable = {0, "pausable","1", "allow players to pause or not"};
-
-cvar_t temp1 = {0, "temp1","0", "general cvar for mods to use, in stock id1 this selects which death animation to use on players (0 = random death, other values select specific death scenes)"};
-
cvar_t timestamps = {CVAR_SAVE, "timestamps", "0", "prints timestamps on console messages"};
-cvar_t timeformat = {CVAR_SAVE, "timeformat", "[%b %e %X] ", "time format to use on timestamped console messages"};
+cvar_t timeformat = {CVAR_SAVE, "timeformat", "[%Y-%m-%d %H:%M:%S] ", "time format to use on timestamped console messages"};
/*
================
======================
*/
void Host_SaveConfig_f(void);
+void Host_LoadConfig_f(void);
static void Host_InitLocal (void)
{
- Cmd_AddCommand("saveconfig", Host_SaveConfig_f, "save settings to config.cfg immediately (also automatic when quitting)");
+ 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");
Cvar_RegisterVariable (&host_framerate);
Cvar_RegisterVariable (&host_speeds);
- Cvar_RegisterVariable (&slowmo);
Cvar_RegisterVariable (&cl_maxfps);
+ Cvar_RegisterVariable (&cl_maxidlefps);
- Cvar_RegisterVariable (&sv_echobprint);
-
- Cvar_RegisterVariable (&sys_ticrate);
- Cvar_RegisterVariable (&sv_fixedframeratesingleplayer);
-
- Cvar_RegisterVariable (&fraglimit);
- Cvar_RegisterVariable (&timelimit);
- Cvar_RegisterVariable (&teamplay);
- Cvar_RegisterVariable (&samelevel);
- Cvar_RegisterVariable (&noexit);
- Cvar_RegisterVariable (&skill);
Cvar_RegisterVariable (&developer);
Cvar_RegisterVariable (&developer_entityparsing);
- Cvar_RegisterVariable (&deathmatch);
- Cvar_RegisterVariable (&coop);
-
- Cvar_RegisterVariable (&pausable);
-
- Cvar_RegisterVariable (&temp1);
Cvar_RegisterVariable (×tamps);
Cvar_RegisterVariable (&timeformat);
Writes key bindings and archived cvars to config.cfg
===============
*/
-void Host_SaveConfig_f(void)
+void Host_SaveConfig_to(const char *file)
{
qfile_t *f;
// 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)
+ if (host_framecount >= 3 && cls.state != ca_dedicated && !COM_CheckParm("-benchmark") && !COM_CheckParm("-capturedemo"))
{
- f = FS_Open ("config.cfg", "wb", false, false);
+ f = FS_Open (file, "wb", false, false);
if (!f)
{
- Con_Print("Couldn't write config.cfg.\n");
+ Con_Printf("Couldn't write %s.\n", file);
return;
}
FS_Close (f);
}
}
+void Host_SaveConfig(void)
+{
+ Host_SaveConfig_to("config.cfg");
+}
+void Host_SaveConfig_f(void)
+{
+ const char *file = "config.cfg";
+ if(Cmd_Argc() >= 2) {
+ file = Cmd_Argv(1);
+ Con_Printf("Saving to %s\n", file);
+ }
+
+ Host_SaveConfig_to(file);
+}
+
+/*
+===============
+Host_LoadConfig_f
+
+Resets key bindings and cvars to defaults and then reloads scripts
+===============
+*/
+void Host_LoadConfig_f(void)
+{
+ // unlock the cvar default strings so they can be updated by the new default.cfg
+ Cvar_UnlockDefaults();
+ // reset cvars to their defaults, and then exec startup scripts again
+ Cbuf_InsertText("cvar_resettodefaults_all;exec quake.rc\n");
+}
/*
=================
for (i = 0, client = svs.clients;i < svs.maxclients;i++, client++)
{
- if (client->spawned && client->netconnection)
+ if (client->active && client->netconnection)
{
MSG_WriteByte(&client->netconnection->message, svc_print);
MSG_WriteString(&client->netconnection->message, msg);
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);
buf.data = bufdata;
buf.maxsize = sizeof(bufdata);
MSG_WriteByte(&buf, svc_disconnect);
- NetConn_SendUnreliableMessage(host_client->netconnection, &buf, sv.protocol);
- NetConn_SendUnreliableMessage(host_client->netconnection, &buf, sv.protocol);
- NetConn_SendUnreliableMessage(host_client->netconnection, &buf, sv.protocol);
+ 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);
}
// break the net connection
NetConn_Close(host_client->netconnection);
prog->globals.server->self = saveSelf;
}
+ // 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->edict->fields.server->netname = PRVM_SetEngineString(host_client->name);
- //if ((val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_clientcolors)))
- // val->_float = 0;
- //host_client->edict->fields.server->frags = 0;
host_client->name[0] = 0;
host_client->colors = 0;
host_client->frags = 0;
// 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_TimeReport
+
+Returns a time report string, for example for
+==================
+*/
+const char *Host_TimingReport()
+{
+ return va("%.1f%% CPU, %.2f%% lost, offset avg %.1fms, max %.1fms, sdev %.1fms", svs.perf_cpuload * 100, svs.perf_lost * 100, svs.perf_offset_avg * 1000, svs.perf_offset_max * 1000, svs.perf_offset_sdev * 1000);
+}
+
/*
==================
Host_Frame
static void Host_Init(void);
void Host_Main(void)
{
- static double time1 = 0;
- static double time2 = 0;
- static double time3 = 0;
- // these are static because of setjmp/longjmp warnings in mingw32 gcc 2.95.3
- static double frameoldtime, framenewtime, frametime, cl_timer, sv_timer;
+ double time1 = 0;
+ double time2 = 0;
+ double time3 = 0;
+ double cl_timer, sv_timer;
+ double clframetime, deltarealtime, oldrealtime;
+ double wait;
+ int pass1, pass2, pass3, i;
Host_Init();
cl_timer = 0;
sv_timer = 0;
- framenewtime = Sys_DoubleTime();
+ realtime = Sys_DoubleTime();
for (;;)
{
if (setjmp(host_abortframe))
continue; // something bad happened, or the server disconnected
- frameoldtime = framenewtime;
- framenewtime = Sys_DoubleTime();
- frametime = framenewtime - frameoldtime;
- realtime += frametime;
+ oldrealtime = realtime;
+ realtime = Sys_DoubleTime();
- // if there is some time remaining from last frame, rest the timers
- if (cl_timer >= 0)
- cl_timer = 0;
- if (sv_timer >= 0)
- sv_timer = 0;
+ deltarealtime = realtime - oldrealtime;
+ cl_timer += deltarealtime;
+ sv_timer += deltarealtime;
- // accumulate the new frametime into the timers
- cl_timer += frametime;
- sv_timer += frametime;
+ svs.perf_acc_realtime += deltarealtime;
- if (slowmo.value < 0)
+ // Look for clients who have spawned
+ for (i = 0, host_client = svs.clients;i < svs.maxclients;i++, host_client++)
+ if(host_client->spawned)
+ if(host_client->netconnection)
+ break;
+ if(i == svs.maxclients)
+ {
+ // Nobody is looking? Then we won't do timing...
+ // Instead, reset it to zero
+ 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)
+ Con_DPrintf("Server can't keep up: %s\n", Host_TimingReport());
+ 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;
+ }
+
+ 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);
- if (cl_maxfps.value < 1)
- Cvar_SetValue("cl_maxfps", 1);
-
- // if the accumulators haven't become positive yet, keep waiting
- if (!cls.timedemo && cl_timer <= 0 && sv_timer <= 0)
- {
- double wait;
- int msleft;
- if (cls.state == ca_dedicated)
- wait = sv_timer;
- else if (!sv.active)
- wait = cl_timer;
- else
- wait = max(cl_timer, sv_timer);
- msleft = (int)floor(wait * -1000.0);
- if (msleft >= 1)
- Sys_Sleep(msleft);
- continue;
- }
- // keep the random time dependent
- rand();
+ // keep the random time dependent, but not when playing demos/benchmarking
+ if(!*sv_random_seed.string && !cls.demoplayback)
+ rand();
cl.islocalgame = NetConn_IsLocalGame();
// get new key events
Sys_SendKeyEvents();
+ NetConn_UpdateSockets();
+
+ Log_DestBuffer_Flush();
+
+ // receive packets on each main loop iteration, as the main loop may
+ // be undersleeping due to select() detecting a new packet
+ if (sv.active)
+ NetConn_ServerFrame();
+
+ Curl_Run();
+
+ // 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 all frames
Cbuf_Execute();
}
- NetConn_UpdateSockets();
+ //Con_Printf("%6.0f %6.0f\n", cl_timer * 1000000.0, sv_timer * 1000000.0);
- Curl_Run();
+ // 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)
+ wait = cl_timer * -1000000.0;
+ else
+ wait = max(cl_timer, sv_timer) * -1000000.0;
+ if (wait > 100000)
+ wait = 100000;
+
+ if (!cls.timedemo && wait > 0)
+ {
+ double time0 = Sys_DoubleTime();
+ if (sv_checkforpacketsduringsleep.integer)
+ {
+ if (wait >= 1)
+ NetConn_SleepMicroseconds((int)wait);
+ }
+ else
+ {
+ if (wait >= 1000)
+ Sys_Sleep((int)wait / 1000);
+ }
+ svs.perf_acc_sleeptime += Sys_DoubleTime() - time0;
+ continue;
+ }
//-------------------
//
//
//-------------------
- // check for commands typed to the host
- Host_GetConsoleCommands();
+ // limit the frametime steps to no more than 100ms each
+ if (cl_timer > 0.1)
+ cl_timer = 0.1;
+ if (sv_timer > 0.1)
+ {
+ svs.perf_acc_lost += (sv_timer - 0.1);
+ sv_timer = 0.1;
+ }
- if (sv_timer > 0)
+ if (sv.active && sv_timer > 0)
{
- if (!sv.active)
+ // 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;
+
+ // 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)
{
- // if there is no server, run server timing at 10fps
- sv_timer -= 0.1;
+ // synchronize to the client frametime, but no less than 10ms and no more than sys_ticrate
+ advancetime = bound(0.01, cl_timer, sys_ticrate.value);
+ framelimit = 10;
+ aborttime = realtime + 0.1;
}
else
{
- // 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;
-
- // receive server packets now, which might contain rcon commands, which
- // may change level or other such things we don't want to have happen in
- // the middle of Host_Frame
- NetConn_ServerFrame();
-
- // 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)
+ advancetime = sys_ticrate.value;
+ // listen servers can run multiple server frames per client frame
+ if (cls.state == ca_connected)
{
- // synchronize to the client frametime, but no less than 10ms and no more than sys_ticrate
- advancetime = bound(0.01, cl_timer, sys_ticrate.value);
framelimit = 10;
- aborttime = Sys_DoubleTime() + 0.1;
+ aborttime = realtime + 0.1;
}
- else
- {
- advancetime = sys_ticrate.value;
- // listen servers can run multiple server frames per client frame
- if (cls.state == ca_connected)
- {
- framelimit = 10;
- aborttime = Sys_DoubleTime() + 0.1;
- }
- }
- advancetime = min(advancetime, 0.1);
+ }
+ advancetime = min(advancetime, 0.1);
- // only advance time if not paused
- // the game also pauses in singleplayer when menu or console is used
- sv.frametime = advancetime * slowmo.value;
- if (host_framerate.value)
- sv.frametime = host_framerate.value;
- if (sv.paused || (cl.islocalgame && (key_dest != key_game || key_consoleactive)))
- sv.frametime = 0;
+ if(advancetime > 0)
+ {
+ offset = sv_timer + (Sys_DoubleTime() - realtime);
+ ++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;
+ }
- // setup the VM frame
- SV_VM_Begin();
+ // only advance time if not paused
+ // the game also pauses in singleplayer when menu or console is used
+ sv.frametime = advancetime * slowmo.value;
+ if (host_framerate.value)
+ sv.frametime = host_framerate.value;
+ if (sv.paused || (cl.islocalgame && (key_dest != key_game || key_consoleactive)))
+ sv.frametime = 0;
- for (framecount = 0;framecount < framelimit && sv_timer > 0;framecount++)
- {
- sv_timer -= advancetime;
+ // setup the VM frame
+ SV_VM_Begin();
- // move things around and think unless paused
- if (sv.frametime)
- SV_Physics();
+ for (framecount = 0;framecount < framelimit && sv_timer > 0;framecount++)
+ {
+ sv_timer -= advancetime;
- // send all messages to the clients
- SV_SendClientMessages();
+ // move things around and think unless paused
+ if (sv.frametime)
+ SV_Physics();
- // clear the general datagram
- SV_ClearDatagram();
+ // if this server frame took too long, break out of the loop
+ if (framelimit > 1 && Sys_DoubleTime() >= aborttime)
+ break;
+ }
- // if this server frame took too long, break out of the loop
- if (framelimit > 1 && Sys_DoubleTime() >= aborttime)
- break;
- }
+ // send all messages to the clients
+ SV_SendClientMessages();
- // end the server VM frame
- SV_VM_End();
+ // end the server VM frame
+ SV_VM_End();
- // send an heartbeat if enough time has passed since the last one
- NetConn_Heartbeat(0);
- }
+ // send an heartbeat if enough time has passed since the last one
+ NetConn_Heartbeat(0);
}
//-------------------
//
//-------------------
- if (cl_timer > 0 || cls.timedemo)
+ if (cls.state != ca_dedicated && (cl_timer > 0 || cls.timedemo))
{
- if (cls.state == ca_dedicated)
+ // decide the simulation time
+ if (cls.capturevideo.active)
{
- // if there is no client, run client timing at 10fps
- cl_timer -= 0.1;
- if (host_speeds.integer)
- time1 = time2 = Sys_DoubleTime();
+ 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)
+ clframetime = cl.realframetime = max(cl_timer, 1.0 / max(5.0f, cl_maxfps.value));
else
+ clframetime = cl.realframetime = max(cl_timer, 1.0 / max(5.0f, cl_maxidlefps.value));
+
+ // apply slowmo scaling
+ clframetime *= cl.movevars_timescale;
+ // scale playback speed of demos by slowmo cvar
+ if (cls.demoplayback)
{
- double frametime;
- frametime = cl.realframetime = min(cl_timer, 1);
+ clframetime *= slowmo.value;
+ // if demo playback is paused, don't advance time at all
+ if (cls.demopaused)
+ clframetime = 0;
+ }
- // decide the simulation time
- if (!cls.timedemo)
- {
- if (cls.capturevideo_active)// && !cls.capturevideo_soundfile)
- {
- frametime = 1.0 / cls.capturevideo_framerate;
- cl.realframetime = max(cl.realframetime, frametime);
- }
- else if (vid_activewindow)
- frametime = cl.realframetime = max(cl.realframetime, 1.0 / cl_maxfps.value);
- else
- frametime = cl.realframetime = 0.1;
-
- // deduct the frame time from the accumulator
- cl_timer -= cl.realframetime;
-
- // apply slowmo scaling
- frametime *= slowmo.value;
-
- // host_framerate overrides all else
- if (host_framerate.value)
- frametime = host_framerate.value;
- }
+ // host_framerate overrides all else
+ if (host_framerate.value)
+ clframetime = host_framerate.value;
- cl.oldtime = cl.time;
- cl.time += frametime;
+ if (cls.timedemo)
+ clframetime = cl.realframetime = cl_timer;
- // Collect input into cmd
- CL_Move();
+ // deduct the frame time from the accumulator
+ cl_timer -= cl.realframetime;
- NetConn_ClientFrame();
+ cl.oldtime = cl.time;
+ cl.time += clframetime;
- if (cls.state == ca_connected)
- {
- CL_ReadFromServer();
- // if running the server remotely, send intentions now after
- // the incoming messages have been read
- //if (!cl.islocalgame)
- // CL_SendCmd();
- }
+ // Collect input into cmd
+ CL_Input();
- // update video
- if (host_speeds.integer)
- time1 = Sys_DoubleTime();
+ // check for new packets
+ NetConn_ClientFrame();
- //ui_update();
+ // read a new frame from a demo if needed
+ CL_ReadDemoMessage();
- CL_VideoFrame();
+ // now that packets have been read, send input to server
+ CL_SendMove();
- CL_UpdateScreen();
+ // update client world (interpolate entities, create trails, etc)
+ CL_UpdateWorld();
- if (host_speeds.integer)
- time2 = Sys_DoubleTime();
+ // update video
+ if (host_speeds.integer)
+ time1 = Sys_DoubleTime();
- // update audio
- if(csqc_usecsqclistener)
- {
- S_Update(&csqc_listenermatrix);
- csqc_usecsqclistener = false;
- }
- else
- S_Update(&r_view.matrix);
+ //ui_update();
+
+ CL_Video_Frame();
+ CL_Gecko_Frame();
+
+ CL_UpdateScreen();
+
+ if (host_speeds.integer)
+ time2 = Sys_DoubleTime();
- CDAudio_Update();
+ // update audio
+ if(cl.csqc_usecsqclistener)
+ {
+ S_Update(&cl.csqc_listenermatrix);
+ cl.csqc_usecsqclistener = false;
}
+ else
+ S_Update(&r_refdef.view.matrix);
+
+ CDAudio_Update();
if (host_speeds.integer)
{
- int pass1, pass2, pass3;
pass1 = (int)((time1 - time3)*1000000);
time3 = Sys_DoubleTime();
pass2 = (int)((time2 - time1)*1000000);
}
}
+ // if there is some time remaining from this frame, reset the timers
+ if (cl_timer >= 0)
+ cl_timer = 0;
+ if (sv_timer >= 0)
+ {
+ svs.perf_acc_lost += sv_timer;
+ sv_timer = 0;
+ }
+
host_framecount++;
}
}
extern void PR_Cmd_Init(void);
extern void COM_Init_Commands(void);
extern void FS_Init_Commands(void);
-extern void COM_CheckRegistered(void);
extern qboolean host_stuffcmdsrun;
/*
int i;
const char* os;
+ if (COM_CheckParm("-profilegameonly"))
+ Sys_AllowProfiling(false);
+
+ // LordHavoc: quake never seeded the random number generator before... heh
+ if (COM_CheckParm("-benchmark"))
+ srand(0); // predictable random sequence for -benchmark
+ else
+ srand(time(NULL));
+
// FIXME: this is evil, but possibly temporary
// COMMANDLINEOPTION: Console: -developer enables warnings and other notices (RECOMMENDED for mod developers)
if (COM_CheckParm("-developer"))
developer_memorydebug.string = "100";
}
- // LordHavoc: quake never seeded the random number generator before... heh
- srand(time(NULL));
+// COMMANDLINEOPTION: Console: -nostdout disables text output to the terminal the game was launched from
+ if (COM_CheckParm("-nostdout"))
+ sys_nostdout = 1;
// used by everything
Memory_Init();
- // initialize console and logging
- Con_Init();
-
// initialize console command/cvar/alias/command execution systems
Cmd_Init();
- // parse commandline
- COM_InitArgv();
+ // initialize memory subsystem cvars/commands
+ Memory_Init_Commands();
+
+ // initialize console and logging and its cvars/commands
+ Con_Init();
+
+ // initialize various cvars that could not be initialized earlier
+ 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();
os = "Unknown";
#endif
dpsnprintf (engineversion, sizeof (engineversion), "%s %s %s", gamename, os, buildstring);
-
-// COMMANDLINEOPTION: Console: -nostdout disables text output to the terminal the game was launched from
- if (COM_CheckParm("-nostdout"))
- sys_nostdout = 1;
- else
- Con_Printf("%s\n", engineversion);
-
- // initialize filesystem (including fs_basedir, fs_gamedir, -path, -game, scr_screenshot_name)
- FS_Init();
-
- // initialize various cvars that could not be initialized earlier
- Memory_Init_Commands();
- Con_Init_Commands();
- Curl_Init_Commands();
- Cmd_Init_Commands();
- Sys_Init_Commands();
- COM_Init_Commands();
- FS_Init_Commands();
- COM_CheckRegistered();
+ Con_Printf("%s\n", engineversion);
// initialize ixtable
Mathlib_Init();
+ // initialize filesystem (including fs_basedir, fs_gamedir, -game, scr_screenshot_name)
+ FS_Init();
+
NetConn_Init();
Curl_Init();
//PR_Init();
//PR_Cmd_Init();
PRVM_Init();
Mod_Init();
+ World_Init();
SV_Init();
Host_InitCommands();
Host_InitLocal();
Cbuf_Execute();
}
- // check for special demolooponly mode
-// COMMANDLINEOPTION: Client: -demolooponly <demoname> runs a playdemo and quits
- i = COM_CheckParm("-demolooponly");
+// COMMANDLINEOPTION: Client: -capturedemo <demoname> captures a playdemo and quits
+ i = COM_CheckParm("-capturedemo");
if (i && i + 1 < com_argc)
if (!sv.active && !cls.demoplayback && !cls.connect_trying)
{
- Cbuf_AddText(va("playdemo %s\n", com_argv[i + 1]));
+ Cbuf_AddText(va("playdemo %s\ncl_capturevideo 1\n", com_argv[i + 1]));
Cbuf_Execute();
}
if (!sv.active && !cls.demoplayback && !cls.connect_trying)
{
- if (gamemode == GAME_NEXUIZ)
- Cbuf_AddText("togglemenu\nplayvideo logo\ncd loop 1\n");
- else
- Cbuf_AddText("togglemenu\n");
+ Cbuf_AddText("togglemenu\n");
Cbuf_Execute();
}
Con_Print("recursive shutdown\n");
return;
}
+ if (setjmp(host_abortframe))
+ {
+ Con_Print("aborted the quitting frame?!?\n");
+ return;
+ }
isdown = true;
// be quiet while shutting down
// AK shutdown PRVM
// AK hmm, no PRVM_Shutdown(); yet
+ CL_Gecko_Shutdown();
CL_Video_Shutdown();
- Host_SaveConfig_f();
+ Host_SaveConfig();
CDAudio_Shutdown ();
S_Terminate ();
projects / xonotic / darkplaces.git / blobdiff