#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"
#include "snd_main.h"
+#include "thread.h"
+#include "utf8lib.h"
/*
// LordHavoc: set when quit is executed
qboolean host_shuttingdown = false;
-// the real time since application started, without any slowmo or clamping
+// 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;
-double host_starttime = 0;
// 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"};
// 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."};
*/
void Host_AbortCurrentFrame(void)
{
+ // in case we were previously nice, make us mean again
+ Sys_MakeProcessMean();
+
longjmp (host_abortframe, 1);
}
*/
void Host_Error (const char *error, ...)
{
- static char hosterrorstring1[MAX_INPUTLINE];
- static char hosterrorstring2[MAX_INPUTLINE];
+ static char hosterrorstring1[MAX_INPUTLINE]; // THREAD UNSAFE
+ static char hosterrorstring2[MAX_INPUTLINE]; // THREAD UNSAFE
static qboolean hosterror = false;
va_list argptr;
//PR_Crash();
// print out where the crash happened, if it was caused by QC (and do a cleanup)
- PRVM_Crash();
+ PRVM_Crash(SVVM_prog);
+ PRVM_Crash(CLVM_prog);
+ PRVM_Crash(MVM_prog);
+ cl.csqc_loaded = false;
+ Cvar_SetValueQuick(&csqc_progcrc, -1);
+ Cvar_SetValueQuick(&csqc_progsize, -1);
+ SV_LockThreadMutex();
Host_ShutdownServer ();
+ SV_UnlockThreadMutex();
if (cls.state == ca_dedicated)
Sys_Error ("Host_Error: %s",hosterrorstring2); // dedicated servers exit
Host_AbortCurrentFrame();
}
-void Host_ServerOptions (void)
+static void Host_ServerOptions (void)
{
int i;
else
{
// default players in some games, singleplayer in most
- if (gamemode != GAME_GOODVSBAD2 && gamemode != GAME_NEXUIZ && gamemode != GAME_BATTLEMECH)
+ if (gamemode != GAME_GOODVSBAD2 && gamemode != GAME_NEXUIZ && gamemode != GAME_XONOTIC && gamemode != GAME_BATTLEMECH)
svs.maxclients = 1;
}
}
void Host_SaveConfig_f(void);
void Host_LoadConfig_f(void);
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");
+ Cvar_RegisterVariable (&cl_maxphysicsframesperserverframe);
Cvar_RegisterVariable (&host_framerate);
Cvar_RegisterVariable (&host_speeds);
Cvar_RegisterVariable (&host_maxwait);
Cvar_RegisterVariable (&timeformat);
Cvar_RegisterVariable (&sv_writepicture_quality);
+ Cvar_RegisterVariable (&r_texture_jpeg_fastpicmip);
}
Writes key bindings and archived cvars to config.cfg
===============
*/
-void Host_SaveConfig_to(const char *file)
+static void Host_SaveConfig_to(const char *file)
{
qfile_t *f;
Host_SaveConfig_to(file);
}
+static void Host_AddConfigText(void)
+{
+ // 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");
+ else if (gamemode == GAME_TRANSFUSION)
+ Cbuf_InsertText("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");
+ else
+ Cbuf_InsertText("alias startmap_sp \"map start\"\nalias startmap_dm \"map start\"\nexec " STARTCONFIGFILENAME "\n");
+}
+
/*
===============
Host_LoadConfig_f
*/
void Host_LoadConfig_f(void)
{
- // unlock the cvar default strings so they can be updated by the new default.cfg
- Cvar_UnlockDefaults();
+ // reset all cvars, commands and aliases to init values
+ Cmd_RestoreInitState();
+ // prepend a menu restart command to execute after the config
+ Cbuf_InsertText("\nmenu_restart\n");
// reset cvars to their defaults, and then exec startup scripts again
- Cbuf_InsertText("cvar_resettodefaults_all;exec " STARTCONFIGFILENAME "\n");
+ Host_AddConfigText();
}
/*
*/
void SV_DropClient(qboolean crash)
{
+ prvm_prog_t *prog = SVVM_prog;
int i;
Con_Printf("Client \"%s\" dropped\n", host_client->name);
if (host_client->netconnection)
{
- // free the client (the body stays around)
+ // tell the client to be gone
if (!crash)
{
// LordHavoc: no opportunity for resending, so use unreliable 3 times
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);
- host_client->netconnection = NULL;
}
// call qc ClientDisconnect function
{
// call the prog function for removing a client
// this will set the body to a dead frame, among other things
- int saveSelf = prog->globals.server->self;
+ int saveSelf = PRVM_serverglobaledict(self);
host_client->clientconnectcalled = false;
- prog->globals.server->self = PRVM_EDICT_TO_PROG(host_client->edict);
- PRVM_ExecuteProgram(prog->globals.server->ClientDisconnect, "QC function ClientDisconnect is missing");
- prog->globals.server->self = saveSelf;
+ 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 (sv.active)
{
// clear a fields that matter to DP_SV_CLIENTNAME and DP_SV_CLIENTCOLORS, and also frags
- PRVM_ED_ClearEdict(host_client->edict);
+ PRVM_ED_ClearEdict(prog, host_client->edict);
}
// clear the client struct (this sets active to false)
*/
void Host_ShutdownServer(void)
{
+ prvm_prog_t *prog = SVVM_prog;
int i;
Con_DPrintf("Host_ShutdownServer\n");
NetConn_Heartbeat(2);
// make sure all the clients know we're disconnecting
- SV_VM_Begin();
World_End(&sv.world);
if(prog->loaded)
- if(prog->funcoffsets.SV_Shutdown)
+ {
+ if(PRVM_serverfunction(SV_Shutdown))
{
- func_t s = prog->funcoffsets.SV_Shutdown;
- prog->funcoffsets.SV_Shutdown = 0; // prevent it from getting called again
- PRVM_ExecuteProgram(s,"SV_Shutdown() required");
+ 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
- SV_VM_End();
NetConn_CloseServerPorts();
//
memset(&sv, 0, sizeof(sv));
memset(svs.clients, 0, svs.maxclients*sizeof(client_t));
+
+ cl.islocalgame = false;
}
Add them exactly as if they had been typed at the console
===================
*/
-void Host_GetConsoleCommands (void)
+static void Host_GetConsoleCommands (void)
{
char *cmd;
Returns a time report string, for example for
==================
*/
-const char *Host_TimingReport(void)
+const char *Host_TimingReport(char *buf, size_t buflen)
{
- 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);
+ return va(buf, buflen, "%.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);
}
/*
double time1 = 0;
double time2 = 0;
double time3 = 0;
- double cl_timer, sv_timer;
- double clframetime, deltarealtime, oldrealtime;
+ double cl_timer = 0, sv_timer = 0;
+ double clframetime, deltacleantime, olddirtytime, dirtytime;
double wait;
int pass1, pass2, pass3, i;
+ char vabuf[1024];
Host_Init();
- cl_timer = 0;
- sv_timer = 0;
-
- realtime = host_starttime = Sys_DoubleTime();
+ realtime = 0;
+ dirtytime = Sys_DirtyTime();
for (;;)
{
if (setjmp(host_abortframe))
continue; // something bad happened, or the server disconnected
}
- oldrealtime = realtime;
- realtime = Sys_DoubleTime();
-
- deltarealtime = realtime - oldrealtime;
- cl_timer += deltarealtime;
- sv_timer += deltarealtime;
-
- svs.perf_acc_realtime += deltarealtime;
-
- // 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)
+ olddirtytime = host_dirtytime;
+ dirtytime = Sys_DirtyTime();
+ deltacleantime = dirtytime - olddirtytime;
+ if (deltacleantime < 0)
{
- // 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;
+ // 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;
}
- else if(svs.perf_acc_realtime > 5)
+ else if (deltacleantime >= 1800)
{
- 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)
+ Con_Printf("Host_Mingled: time stepped forward (went from %f to %f, difference %f)\n", olddirtytime, dirtytime, deltacleantime);
+ deltacleantime = 0;
+ }
+ realtime += deltacleantime;
+ host_dirtytime = dirtytime;
+
+ cl_timer += deltacleantime;
+ sv_timer += deltacleantime;
+
+ if (!svs.threaded)
+ {
+ svs.perf_acc_realtime += deltacleantime;
+
+ // 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_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);
+ 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)
+ 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;
}
- if(svs.perf_lost > 0 && developer_extra.integer)
- 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)
if(!*sv_random_seed.string && !cls.demoplayback)
rand();
- cl.islocalgame = NetConn_IsLocalGame();
-
// get new key events
Key_EventQueue_Unblock();
SndSys_SendKeyEvents();
// receive packets on each main loop iteration, as the main loop may
// be undersleeping due to select() detecting a new packet
- if (sv.active)
+ if (sv.active && !svs.threaded)
NetConn_ServerFrame();
Curl_Run();
// process console commands
// R_TimeReport("preconsole");
CL_VM_PreventInformationLeaks();
- Cbuf_Execute();
+ Cbuf_Frame();
// R_TimeReport("console");
}
// 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)
+ else if (!sv.active || svs.threaded)
wait = cl_timer * -1000000.0;
else
wait = max(cl_timer, sv_timer) * -1000000.0;
if (!cls.timedemo && wait >= 1)
{
- double time0;
+ double time0, delta;
if(host_maxwait.value <= 0)
wait = min(wait, 1000000.0);
if(wait < 1)
wait = 1; // because we cast to int
- time0 = Sys_DoubleTime();
- if (sv_checkforpacketsduringsleep.integer && !sys_usenoclockbutbenchmark.integer)
+ time0 = Sys_DirtyTime();
+ if (sv_checkforpacketsduringsleep.integer && !sys_usenoclockbutbenchmark.integer && !svs.threaded)
NetConn_SleepMicroseconds((int)wait);
else
Sys_Sleep((int)wait);
- svs.perf_acc_sleeptime += Sys_DoubleTime() - time0;
+ delta = Sys_DirtyTime() - time0;
+ if (delta < 0 || delta >= 1800) delta = 0;
+ if (!svs.threaded)
+ svs.perf_acc_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("---");
//-------------------
//-------------------
// 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.active && sv_timer > 0)
+ 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
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
{
// 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;
+ framelimit = cl_maxphysicsframesperserverframe.integer;
aborttime = realtime + 0.1;
}
else
// listen servers can run multiple server frames per client frame
if (cls.state == ca_connected)
{
- framelimit = 10;
+ framelimit = cl_maxphysicsframesperserverframe.integer;
aborttime = realtime + 0.1;
}
}
if(advancetime > 0)
{
- offset = sv_timer + (Sys_DoubleTime() - realtime);
+ offset = Sys_DirtyTime() - realtime;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 (sv.paused || (cl.islocalgame && (key_dest != key_game || key_consoleactive || cl.csqc_paused)))
sv.frametime = 0;
- // setup the VM frame
- SV_VM_Begin();
-
for (framecount = 0;framecount < framelimit && sv_timer > 0;framecount++)
{
sv_timer -= advancetime;
SV_Physics();
// if this server frame took too long, break out of the loop
- if (framelimit > 1 && Sys_DoubleTime() >= aborttime)
+ if (framelimit > 1 && Sys_DirtyTime() >= aborttime)
break;
}
R_TimeReport("serverphysics");
// 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;
- PRVM_ExecuteProgram(prog->funcoffsets.SV_PausedTic, "QC function SV_PausedTic is missing");
+ PRVM_serverglobalfloat(time) = sv.time;
+ prog->ExecuteProgram(prog, PRVM_serverfunction(SV_PausedTic), "QC function SV_PausedTic is missing");
}
- // end the server VM frame
- SV_VM_End();
-
// send an heartbeat if enough time has passed since the last one
NetConn_Heartbeat(0);
R_TimeReport("servernetwork");
}
- else
+ else if (!svs.threaded)
{
// don't let r_speeds display jump around
R_TimeReport("serverphysics");
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");
// decide the simulation time
if (cls.capturevideo.active)
{
// update video
if (host_speeds.integer)
- time1 = Sys_DoubleTime();
+ time1 = Sys_DirtyTime();
R_TimeReport("pre-input");
// Collect input into cmd
R_TimeReport("lerpworld");
CL_Video_Frame();
- CL_Gecko_Frame();
R_TimeReport("client");
R_TimeReport("render");
if (host_speeds.integer)
- time2 = Sys_DoubleTime();
+ time2 = Sys_DirtyTime();
// update audio
if(cl.csqc_usecsqclistener)
if (host_speeds.integer)
{
pass1 = (int)((time1 - time3)*1000000);
- time3 = Sys_DoubleTime();
+ time3 = Sys_DirtyTime();
pass2 = (int)((time2 - time1)*1000000);
pass3 = (int)((time3 - time2)*1000000);
Con_Printf("%6ius total %6ius server %6ius gfx %6ius snd\n",
cl_timer = 0;
if (sv_timer >= 0)
{
- svs.perf_acc_lost += sv_timer;
+ if (!svs.threaded)
+ svs.perf_acc_lost += sv_timer;
sv_timer = 0;
}
qboolean sys_nostdout = false;
-extern void u8_Init(void);
-extern void Render_Init(void);
-extern void Mathlib_Init(void);
-extern void FS_Init_SelfPack(void);
-extern void FS_Init(void);
-extern void FS_Shutdown(void);
-extern void PR_Cmd_Init(void);
-extern void COM_Init_Commands(void);
-extern void FS_Init_Commands(void);
extern qboolean host_stuffcmdsrun;
/*
{
int i;
const char* os;
+ char vabuf[1024];
if (COM_CheckParm("-profilegameonly"))
Sys_AllowProfiling(false);
developer.string = "1";
}
- if (COM_CheckParm("-developer2"))
+ if (COM_CheckParm("-developer2") || COM_CheckParm("-developer3"))
{
developer.value = developer.integer = 1;
developer.string = "1";
developer_memorydebug.string = "1";
}
+ if (COM_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"))
sys_nostdout = 1;
dpsnprintf (engineversion, sizeof (engineversion), "%s %s %s", gamename, os, buildstring);
Con_Printf("%s\n", engineversion);
+ // initialize process nice level
+ Sys_InitProcessNice();
+
// initialize ixtable
Mathlib_Init();
// initialize filesystem (including fs_basedir, fs_gamedir, -game, scr_screenshot_name)
FS_Init();
+ // must be after FS_Init
+ Crypto_Init();
+ Crypto_Init_Commands();
+
NetConn_Init();
Curl_Init();
//PR_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();
+
if (cls.state == ca_dedicated)
Cmd_AddCommand ("disconnect", CL_Disconnect_f, "disconnect from server (or disconnect all clients if running a server)");
else
S_Init();
CDAudio_Init();
Key_Init();
- V_Init();
CL_Init();
}
- // 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_AddText("alias startmap_sp \"map nehstart\"\nalias startmap_dm \"map nehstart\"\nexec " STARTCONFIGFILENAME "\n");
- else if (gamemode == GAME_TRANSFUSION)
- Cbuf_AddText("alias startmap_sp \"map e1m1\"\n""alias startmap_dm \"map bb1\"\nexec " STARTCONFIGFILENAME "\n");
- else if (gamemode == GAME_TEU)
- Cbuf_AddText("alias startmap_sp \"map start\"\nalias startmap_dm \"map start\"\nexec teu.rc\n");
- else
- Cbuf_AddText("alias startmap_sp \"map start\"\nalias startmap_dm \"map start\"\nexec " STARTCONFIGFILENAME "\n");
+ // 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
+ Cmd_SaveInitState();
+
+ // FIXME: put this into some neat design, but the menu should be allowed to crash
+ // 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();
Cbuf_Execute();
// if stuffcmds wasn't run, then quake.rc is probably missing, use default
// put up the loading image so the user doesn't stare at a black screen...
SCR_BeginLoadingPlaque();
- // FIXME: put this into some neat design, but the menu should be allowed to crash
- // 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;
- }
-
if (cls.state != ca_dedicated)
{
MR_Init();
if (i && i + 1 < com_argc)
if (!sv.active && !cls.demoplayback && !cls.connect_trying)
{
- Cbuf_AddText(va("timedemo %s\n", com_argv[i + 1]));
+ Cbuf_AddText(va(vabuf, sizeof(vabuf), "timedemo %s\n", com_argv[i + 1]));
Cbuf_Execute();
}
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(vabuf, sizeof(vabuf), "playdemo %s\n", com_argv[i + 1]));
Cbuf_Execute();
}
if (i && i + 1 < com_argc)
if (!sv.active && !cls.demoplayback && !cls.connect_trying)
{
- Cbuf_AddText(va("playdemo %s\ncl_capturevideo 1\n", com_argv[i + 1]));
+ Cbuf_AddText(va(vabuf, sizeof(vabuf), "playdemo %s\ncl_capturevideo 1\n", com_argv[i + 1]));
Cbuf_Execute();
}
Con_DPrint("========Initialized=========\n");
//Host_StartVideo();
+
+ if (cls.state != ca_dedicated)
+ SV_StartThread();
}
// be quiet while shutting down
S_StopAllSounds();
+ // 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_UnlockThreadMutex();
// Shutdown menu
if(MR_Shutdown)
// AK shutdown PRVM
// AK hmm, no PRVM_Shutdown(); yet
- CL_Gecko_Shutdown();
CL_Video_Shutdown();
Host_SaveConfig();
VID_Shutdown();
}
+ SV_StopThread();
+ Thread_Shutdown();
Cmd_Shutdown();
Key_Shutdown();
CL_Shutdown();
Sys_Shutdown();
Log_Close();
+ Crypto_Shutdown();
FS_Shutdown();
Con_Shutdown();
Memory_Shutdown();
projects / xonotic / darkplaces.git / blobdiff