X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=host.c;h=3812d49838c98272c92f3810b420bbc26964ecbb;hb=08f1e9f56f1df011b616af3c7382bdf0c9c96846;hp=e659909fc8042d03a1a56eb6cdfc20cc1b84d720;hpb=9a80ba43c8707aa586e95dfea40018da2d8c85d2;p=xonotic%2Fdarkplaces.git

diff --git a/host.c b/host.c
index e659909f..3812d498 100644
--- a/host.c
+++ b/host.c
@@ -44,21 +44,7 @@ Memory is cleared / released when a server or client begins, not when they end.
 
 */
 
-// how many frames have occurred
-// (checked by Host_Error and Host_SaveConfig_f)
-int host_framecount = 0;
-// LadyHavoc: set when quit is executed
-qboolean host_shuttingdown = false;
-
-// the accumulated mainloop time since application started (with filtering), without any slowmo or clamping
-double realtime;
-// the main loop wall time for this frame
-double host_dirtytime;
-
-// current client
-client_t *host_client;
-
-jmp_buf host_abortframe;
+host_t host;
 
 // pretend frames take this amount of time (in seconds), 0 = realtime
 cvar_t host_framerate = {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"};
@@ -104,7 +90,7 @@ void Host_AbortCurrentFrame(void)
 	// in case we were previously nice, make us mean again
 	Sys_MakeProcessMean();
 
-	longjmp (host_abortframe, 1);
+	longjmp (host.abortframe, 1);
 }
 
 /*
@@ -129,11 +115,11 @@ void Host_Error (const char *error, ...)
 	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)
@@ -160,7 +146,7 @@ void Host_Error (const char *error, ...)
 	Cvar_SetValueQuick(&csqc_progsize, -1);
 
 	SV_LockThreadMutex();
-	Host_ShutdownServer ();
+	SV_Shutdown ();
 	SV_UnlockThreadMutex();
 
 	if (cls.state == ca_dedicated)
@@ -190,8 +176,8 @@ static void Host_ServerOptions (void)
 	{
 		cls.state = ca_dedicated;
 		// check for -dedicated specifying how many players
-		if (i && i + 1 < com_argc && atoi (com_argv[i+1]) >= 1)
-			svs.maxclients = atoi (com_argv[i+1]);
+		if (i && i + 1 < sys.argc && atoi (sys.argv[i+1]) >= 1)
+			svs.maxclients = atoi (sys.argv[i+1]);
 		if (COM_CheckParm ("-listen"))
 			Con_Printf ("Only one of -dedicated or -listen can be specified\n");
 		// default sv_public on for dedicated servers (often hosted by serious administrators), off for listen servers (often hosted by clueless users)
@@ -205,8 +191,8 @@ static void Host_ServerOptions (void)
 		if (i)
 		{
 			// default players unless specified
-			if (i + 1 < com_argc && atoi (com_argv[i+1]) >= 1)
-				svs.maxclients = atoi (com_argv[i+1]);
+			if (i + 1 < sys.argc && atoi (sys.argv[i+1]) >= 1)
+				svs.maxclients = atoi (sys.argv[i+1]);
 		}
 		else
 		{
@@ -224,6 +210,24 @@ static void Host_ServerOptions (void)
 		Cvar_SetValueQuick(&deathmatch, 1);
 }
 
+/*
+==================
+Host_Quit_f
+==================
+*/
+void Host_Quit_f(cmd_state_t *cmd)
+{
+	if(host.state == host_shutdown)
+		Con_Printf("shutting down already!\n");
+	else
+		host.state = host_shutdown;
+}
+
+static void Host_Version_f(cmd_state_t *cmd)
+{
+	Con_Printf("Version: %s build %s\n", gamename, buildstring);
+}
+
 /*
 =======================
 Host_InitLocal
@@ -235,11 +239,10 @@ extern cvar_t sv_writepicture_quality;
 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(CMD_SHARED, "quit", Host_Quit_f, "quit the game");
+	Cmd_AddCommand(CMD_SHARED, "version", Host_Version_f, "print engine version");
+	Cmd_AddCommand(CMD_SHARED, "saveconfig", Host_SaveConfig_f, "save settings to config.cfg (or a specified filename) immediately (also automatic when quitting)");
+	Cmd_AddCommand(CMD_SHARED, "loadconfig", Host_LoadConfig_f, "reset everything and reload configs");
 	Cvar_RegisterVariable (&cl_maxphysicsframesperserverframe);
 	Cvar_RegisterVariable (&host_framerate);
 	Cvar_RegisterVariable (&host_speeds);
@@ -285,12 +288,12 @@ static void Host_SaveConfig_to(const char *file)
 // 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 && !COM_CheckParm("-benchmark") && !COM_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;
 		}
 
@@ -328,6 +331,7 @@ static void Host_AddConfigText(cmd_state_t *cmd)
 		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);
 }
 
 /*
@@ -349,280 +353,6 @@ void Host_LoadConfig_f(cmd_state_t *cmd)
 	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;
-}
-
-
 //============================================================================
 
 /*
@@ -671,7 +401,7 @@ void Host_Main(void)
 	double time2 = 0;
 	double time3 = 0;
 	double cl_timer = 0, sv_timer = 0;
-	double clframetime, deltacleantime, olddirtytime, dirtytime;
+	double clframetime, time, oldtime, newtime;
 	double wait;
 	int pass1, pass2, pass3, i;
 	char vabuf[1024];
@@ -679,40 +409,41 @@ void Host_Main(void)
 
 	Host_Init();
 
-	realtime = 0;
-	host_dirtytime = Sys_DirtyTime();
-	for (;;)
+	host.realtime = 0;
+	host.dirtytime = Sys_DirtyTime();
+
+	while(host.state != host_shutdown)
 	{
-		if (setjmp(host_abortframe))
+		if (setjmp(host.abortframe))
 		{
 			SCR_ClearLoadingScreen(false);
 			continue;			// something bad happened, or the server disconnected
 		}
 
-		olddirtytime = host_dirtytime;
-		dirtytime = Sys_DirtyTime();
-		deltacleantime = dirtytime - olddirtytime;
-		if (deltacleantime < 0)
+		oldtime = host.dirtytime;
+		newtime = Sys_DirtyTime();
+		time = newtime - oldtime;
+		if (time < 0)
 		{
 			// warn if it's significant
-			if (deltacleantime < -0.01)
-				Con_Warnf("Host_Mingled: time stepped backwards (went from %f to %f, difference %f)\n", olddirtytime, dirtytime, deltacleantime);
-			deltacleantime = 0;
+			if (time < -0.01)
+				Con_Printf(CON_WARN "Host_Mingled: time stepped backwards (went from %f to %f, difference %f)\n", oldtime, newtime, time);
+			time = 0;
 		}
-		else if (deltacleantime >= 1800)
+		else if (time >= 1800)
 		{
-			Con_Warnf("Host_Mingled: time stepped forward (went from %f to %f, difference %f)\n", olddirtytime, dirtytime, deltacleantime);
-			deltacleantime = 0;
+			Con_Printf(CON_WARN "Host_Mingled: time stepped forward (went from %f to %f, difference %f)\n", oldtime, newtime, time);
+			time = 0;
 		}
-		realtime += deltacleantime;
-		host_dirtytime = dirtytime;
+		host.realtime += time;
+		host.dirtytime = newtime;
 
-		cl_timer += deltacleantime;
-		sv_timer += deltacleantime;
+		cl_timer += time;
+		sv_timer += time;
 
 		if (!svs.threaded)
 		{
-			svs.perf_acc_realtime += deltacleantime;
+			svs.perf_acc_realtime += time;
 
 			// Look for clients who have spawned
 			playing = false;
@@ -743,8 +474,6 @@ void Host_Main(void)
 			}
 		}
 
-		if (slowmo.value < 0.00001 && slowmo.value != 0)
-			Cvar_SetValueQuick(&slowmo, 0);
 		if (host_framerate.value < 0.00001 && host_framerate.value != 0)
 			Cvar_SetValueQuick(&host_framerate, 0);
 
@@ -754,11 +483,6 @@ void Host_Main(void)
 		if(!*sv_random_seed.string && !cls.demoplayback)
 			rand();
 
-		// get new key events
-		Key_EventQueue_Unblock();
-		SndSys_SendKeyEvents();
-		Sys_SendKeyEvents();
-
 		NetConn_UpdateSockets();
 
 		Log_DestBuffer_Flush();
@@ -773,25 +497,16 @@ void Host_Main(void)
 		// check for commands typed to the host
 		Host_GetConsoleCommands();
 
-		// when a server is running we only execute console commands on server frames
-		// (this mainly allows frikbot .way config files to work properly by staying in sync with the server qc)
-		// otherwise we execute them on client frames
-		if (sv.active ? sv_timer > 0 : cl_timer > 0)
-		{
-			// process console commands
-//			R_TimeReport("preconsole");
-			CL_VM_PreventInformationLeaks();
-			Cbuf_Frame(&cmd_clientfromserver);
-			Cbuf_Frame(&cmd_client);
-			Cbuf_Frame(&cmd_server);
-
-			if(sv.active)
-			{
-				Cbuf_Frame(&cmd_serverfromclient);
-			}
+		// process console commands
+//		R_TimeReport("preconsole");
+		CL_VM_PreventInformationLeaks();
+		Cbuf_Frame(&cmd_client);
+		Cbuf_Frame(&cmd_server);
 
-//			R_TimeReport("console");
-		}
+		if(sv.active)
+			Cbuf_Frame(&cmd_serverfromclient);
+
+//		R_TimeReport("console");
 
 		//Con_Printf("%6.0f %6.0f\n", cl_timer * 1000000.0, sv_timer * 1000000.0);
 
@@ -879,14 +594,14 @@ void Host_Main(void)
 				framelimit = cl_maxphysicsframesperserverframe.integer;
 				aborttime = Sys_DirtyTime() + 0.1;
 			}
-			if(slowmo.value > 0 && slowmo.value < 1)
-				advancetime = min(advancetime, 0.1 / slowmo.value);
+			if(host_timescale.value > 0 && host_timescale.value < 1)
+				advancetime = min(advancetime, 0.1 / host_timescale.value);
 			else
 				advancetime = min(advancetime, 0.1);
 
 			if(advancetime > 0)
 			{
-				offset = Sys_DirtyTime() - dirtytime;if (offset < 0 || offset >= 1800) offset = 0;
+				offset = Sys_DirtyTime() - newtime;if (offset < 0 || offset >= 1800) offset = 0;
 				offset += sv_timer;
 				++svs.perf_acc_offset_samples;
 				svs.perf_acc_offset += offset;
@@ -897,7 +612,7 @@ void Host_Main(void)
 
 			// only advance time if not paused
 			// the game also pauses in singleplayer when menu or console is used
-			sv.frametime = advancetime * slowmo.value;
+			sv.frametime = advancetime * host_timescale.value;
 			if (host_framerate.value)
 				sv.frametime = host_framerate.value;
 			if (sv.paused || (cl.islocalgame && (key_dest != key_game || key_consoleactive || cl.csqc_paused)))
@@ -920,8 +635,8 @@ void Host_Main(void)
 			// send all messages to the clients
 			SV_SendClientMessages();
 
-			if (sv.paused == 1 && realtime > sv.pausedstart && sv.pausedstart > 0) {
-				prog->globals.fp[OFS_PARM0] = realtime - sv.pausedstart;
+			if (sv.paused == 1 && host.realtime > sv.pausedstart && sv.pausedstart > 0) {
+				prog->globals.fp[OFS_PARM0] = host.realtime - sv.pausedstart;
 				PRVM_serverglobalfloat(time) = sv.time;
 				prog->ExecuteProgram(prog, PRVM_serverfunction(SV_PausedTic), "QC function SV_PausedTic is missing");
 			}
@@ -943,11 +658,17 @@ void Host_Main(void)
 	//
 	//-------------------
 
+		// get new key events
+		Key_EventQueue_Unblock();
+		SndSys_SendKeyEvents();
+		Sys_SendKeyEvents();
+
 		if (cls.state != ca_dedicated && (cl_timer > 0 || cls.timedemo || ((vid_activewindow ? cl_maxfps : cl_maxidlefps).value < 1)))
 		{
 			R_TimeReport("---");
 			Collision_Cache_NewFrame();
 			R_TimeReport("photoncache");
+#ifdef CONFIG_VIDEO_CAPTURE
 			// decide the simulation time
 			if (cls.capturevideo.active)
 			{
@@ -961,6 +682,10 @@ void Host_Main(void)
 				}
 			}
 			else if (vid_activewindow && cl_maxfps.value >= 1 && !cls.timedemo)
+
+#else
+			if (vid_activewindow && cl_maxfps.value >= 1 && !cls.timedemo)
+#endif
 			{
 				clframetime = cl.realframetime = max(cl_timer, 1.0 / cl_maxfps.value);
 				// when running slow, we need to sleep to keep input responsive
@@ -978,7 +703,7 @@ void Host_Main(void)
 			// scale playback speed of demos by slowmo cvar
 			if (cls.demoplayback)
 			{
-				clframetime *= slowmo.value;
+				clframetime *= host_timescale.value;
 				// if demo playback is paused, don't advance time at all
 				if (cls.demopaused)
 					clframetime = 0;
@@ -1080,8 +805,10 @@ void Host_Main(void)
 			sv_timer = 0;
 		}
 
-		host_framecount++;
+		host.framecount++;
 	}
+
+	Sys_Quit(0);
 }
 
 //============================================================================
@@ -1108,17 +835,21 @@ static qboolean locksession_run = false;
 static void Host_InitSession(void)
 {
 	int i;
+	char *buf;
 	Cvar_RegisterVariable(&sessionid);
 	Cvar_RegisterVariable(&locksession);
 
 	// load the session ID into the read-only cvar
-	if ((i = COM_CheckParm("-sessionid")) && (i + 1 < com_argc))
+	if ((i = COM_CheckParm("-sessionid")) && (i + 1 < sys.argc))
 	{
-		char vabuf[1024];
-		if(com_argv[i+1][0] == '.')
-			Cvar_SetQuick(&sessionid, com_argv[i+1]);
+		if(sys.argv[i+1][0] == '.')
+			Cvar_SetQuick(&sessionid, sys.argv[i+1]);
 		else
-			Cvar_SetQuick(&sessionid, va(vabuf, sizeof(vabuf), ".%s", com_argv[i+1]));
+		{
+			buf = (char *)Z_Malloc(strlen(sys.argv[i+1]) + 2);
+			dpsnprintf(buf, sizeof(buf), ".%s", sys.argv[i+1]);
+			Cvar_SetQuick(&sessionid, buf);
+		}
 	}
 }
 void Host_LockSession(void)
@@ -1137,7 +868,7 @@ void Host_LockSession(void)
 		{
 			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
 			{
@@ -1162,8 +893,6 @@ void Host_UnlockSession(void)
 	}
 }
 
-extern hook_t *csqc_concmd;
-
 /*
 ====================
 Host_Init
@@ -1174,9 +903,10 @@ static void Host_Init (void)
 	int i;
 	const char* os;
 	char vabuf[1024];
-	qboolean dedicated_server = COM_CheckParm("-dedicated") || !cl_available;
 	cmd_state_t *cmd = &cmd_client;
 
+	host.state = host_init;
+
 	if (COM_CheckParm("-profilegameonly"))
 		Sys_AllowProfiling(false);
 
@@ -1226,13 +956,9 @@ static void Host_Init (void)
 	// initialize console command/cvar/alias/command execution systems
 	Cmd_Init();
 
-	Cmd_Init_Commands(dedicated_server);
-
 	// initialize memory subsystem cvars/commands
 	Memory_Init_Commands();
 
-	Hook_Init();
-	csqc_concmd = Hook_Register(csqc_concmd,CL_VM_ConsoleCommand,1);
 	// initialize console and logging and its cvars/commands
 	Con_Init();
 
@@ -1241,16 +967,9 @@ static void Host_Init (void)
 	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;
@@ -1263,9 +982,6 @@ static void Host_Init (void)
 	// initialize ixtable
 	Mathlib_Init();
 
-	// initialize filesystem (including fs_basedir, fs_gamedir, -game, scr_screenshot_name)
-	FS_Init();
-
 	// register the cvars for session locking
 	Host_InitSession();
 
@@ -1275,14 +991,11 @@ static void Host_Init (void)
 
 	NetConn_Init();
 	Curl_Init();
-	//PR_Init();
-	//PR_Cmd_Init();
 	PRVM_Init();
 	Mod_Init();
 	World_Init();
 	SV_Init();
 	V_Init(); // some cvars needed by server player physics (cl_rollangle etc)
-	Host_InitCommands();
 	Host_InitLocal();
 	Host_ServerOptions();
 
@@ -1299,63 +1012,62 @@ static void Host_Init (void)
 	// without crashing the whole game, so this should just be a short-time solution
 
 	// here comes the not so critical stuff
-	if (setjmp(host_abortframe)) {
+	if (setjmp(host.abortframe)) {
 		return;
 	}
 
 	Host_AddConfigText(cmd);
-	Cbuf_Execute(cmd);
 
-	// if stuffcmds wasn't run, then quake.rc is probably missing, use default
-	if (!host_stuffcmdsrun)
+	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\nstuffcmds\n");
+		Cbuf_InsertText(cmd, "exec default.cfg\nexec " CONFIGFILENAME "\nexec autoexec.cfg\n");
 		Cbuf_Execute(cmd);
 	}
 
+	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);
+
 	Log_Start();
-	
-	// Starting after we parse commands so the screen resolution doesn't get weird for the first few seconds
-	Host_StartVideo();
-	
+
 	// 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)
+	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_AddText(&cmd_client, va(vabuf, sizeof(vabuf), "timedemo %s\n", sys.argv[i + 1]));
 		Cbuf_Execute(&cmd_client);
 	}
 
 	// check for special demo mode
 // COMMANDLINEOPTION: Client: -demo <demoname> runs a playdemo and quits
 	i = COM_CheckParm("-demo");
-	if (i && i + 1 < com_argc)
+	if (i && i + 1 < sys.argc)
 	if (!sv.active && !cls.demoplayback && !cls.connect_trying)
 	{
-		Cbuf_AddText(&cmd_client, va(vabuf, sizeof(vabuf), "playdemo %s\n", com_argv[i + 1]));
+		Cbuf_AddText(&cmd_client, va(vabuf, sizeof(vabuf), "playdemo %s\n", sys.argv[i + 1]));
 		Cbuf_Execute(&cmd_client);
 	}
 
+#ifdef CONFIG_VIDEO_CAPTURE
 // COMMANDLINEOPTION: Client: -capturedemo <demoname> captures a playdemo and quits
 	i = COM_CheckParm("-capturedemo");
-	if (i && i + 1 < com_argc)
+	if (i && i + 1 < sys.argc)
 	if (!sv.active && !cls.demoplayback && !cls.connect_trying)
 	{
-		Cbuf_AddText(&cmd_client, va(vabuf, sizeof(vabuf), "playdemo %s\ncl_capturevideo 1\n", com_argv[i + 1]));
+		Cbuf_AddText(&cmd_client, va(vabuf, sizeof(vabuf), "playdemo %s\ncl_capturevideo 1\n", sys.argv[i + 1]));
 		Cbuf_Execute(&cmd_client);
 	}
+#endif
 
 	if (cls.state == ca_dedicated || COM_CheckParm("-listen"))
 	if (!sv.active && !cls.demoplayback && !cls.connect_trying)
@@ -1374,8 +1086,6 @@ static void Host_Init (void)
 
 	Con_DPrint("========Initialized=========\n");
 
-	//Host_StartVideo();
-
 	if (cls.state != ca_dedicated)
 		SV_StartThread();
 }
@@ -1398,7 +1108,7 @@ void Host_Shutdown(void)
 		Con_Print("recursive shutdown\n");
 		return;
 	}
-	if (setjmp(host_abortframe))
+	if (setjmp(host.abortframe))
 	{
 		Con_Print("aborted the quitting frame?!?\n");
 		return;
@@ -1417,7 +1127,7 @@ void Host_Shutdown(void)
 
 	// shut down local server if active
 	SV_LockThreadMutex();
-	Host_ShutdownServer ();
+	SV_Shutdown ();
 	SV_UnlockThreadMutex();
 
 #ifdef CONFIG_MENU
@@ -1437,7 +1147,6 @@ void Host_Shutdown(void)
 	S_Terminate ();
 	Curl_Shutdown ();
 	NetConn_Shutdown ();
-	//PR_Shutdown ();
 
 	if (cls.state != ca_dedicated)
 	{
@@ -1462,3 +1171,6 @@ void Host_Shutdown(void)
 	Memory_Shutdown();
 }
 
+void Host_NoOperation_f(cmd_state_t *cmd)
+{
+}