X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=host.c;h=8fc6c0827ee1471c51f404285da4f425f42940c3;hb=83f8124af58307eae378846c9746b5d769673474;hp=72ed8b9833276176d2a10a9878b5cc5e4594528a;hpb=08798068fc28f075e3c8b6abb5bee2bbda3c25a8;p=xonotic%2Fdarkplaces.git

diff --git a/host.c b/host.c
index 72ed8b98..8fc6c082 100644
--- a/host.c
+++ b/host.c
@@ -150,7 +150,9 @@ void Host_Error (const char *error, ...)
 	// print out where the crash happened, if it was caused by QC (and do a cleanup)
 	PRVM_Crash(SVVM_prog);
 	PRVM_Crash(CLVM_prog);
+#ifdef CONFIG_MENU
 	PRVM_Crash(MVM_prog);
+#endif
 
 	cl.csqc_loaded = false;
 	Cvar_SetValueQuick(&csqc_progcrc, -1);
@@ -208,7 +210,7 @@ static void Host_ServerOptions (void)
 		else
 		{
 			// default players in some games, singleplayer in most
-			if (gamemode != GAME_GOODVSBAD2 && gamemode != GAME_NEXUIZ && gamemode != GAME_XONOTIC && gamemode != GAME_BATTLEMECH)
+			if (gamemode != GAME_GOODVSBAD2 && !IS_NEXUIZ_DERIVED(gamemode) && gamemode != GAME_BATTLEMECH)
 				svs.maxclients = 1;
 		}
 	}
@@ -336,8 +338,10 @@ void Host_LoadConfig_f(void)
 {
 	// reset all cvars, commands and aliases to init values
 	Cmd_RestoreInitState();
+#ifdef CONFIG_MENU
 	// prepend a menu restart command to execute after the config
 	Cbuf_InsertText("\nmenu_restart\n");
+#endif
 	// reset cvars to their defaults, and then exec startup scripts again
 	Host_AddConfigText();
 }
@@ -477,9 +481,9 @@ void SV_DropClient(qboolean crash)
 			buf.data = bufdata;
 			buf.maxsize = sizeof(bufdata);
 			MSG_WriteByte(&buf, svc_disconnect);
-			NetConn_SendUnreliableMessage(host_client->netconnection, &buf, sv.protocol, 10000, false);
-			NetConn_SendUnreliableMessage(host_client->netconnection, &buf, sv.protocol, 10000, false);
-			NetConn_SendUnreliableMessage(host_client->netconnection, &buf, sv.protocol, 10000, false);
+			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);
 		}
 	}
 
@@ -673,6 +677,7 @@ void Host_Main(void)
 	Host_Init();
 
 	realtime = 0;
+	host_dirtytime = Sys_DirtyTime();
 	for (;;)
 	{
 		if (setjmp(host_abortframe))
@@ -709,7 +714,7 @@ void Host_Main(void)
 			// Look for clients who have spawned
 			playing = false;
 			for (i = 0, host_client = svs.clients;i < svs.maxclients;i++, host_client++)
-				if(host_client->spawned)
+				if(host_client->begun)
 					if(host_client->netconnection)
 						playing = true;
 			if(sv.time < 10)
@@ -797,8 +802,12 @@ void Host_Main(void)
 				wait = 1; // because we cast to int
 
 			time0 = Sys_DirtyTime();
-			if (sv_checkforpacketsduringsleep.integer && !sys_usenoclockbutbenchmark.integer && !svs.threaded)
+			if (sv_checkforpacketsduringsleep.integer && !sys_usenoclockbutbenchmark.integer && !svs.threaded) {
 				NetConn_SleepMicroseconds((int)wait);
+				if (cls.state != ca_dedicated)
+					NetConn_ClientFrame(); // helps server browser get good ping values
+				// TODO can we do the same for ServerFrame? Probably not.
+			}
 			else
 				Sys_Sleep((int)wait);
 			delta = Sys_DirtyTime() - time0;
@@ -925,7 +934,7 @@ void Host_Main(void)
 		{
 			R_TimeReport("---");
 			Collision_Cache_NewFrame();
-			R_TimeReport("collisioncache");
+			R_TimeReport("photoncache");
 			// decide the simulation time
 			if (cls.capturevideo.active)
 			{
@@ -961,13 +970,15 @@ void Host_Main(void)
 				if (cls.demopaused)
 					clframetime = 0;
 			}
+			else
+			{
+				// host_framerate overrides all else
+				if (host_framerate.value)
+					clframetime = host_framerate.value;
 
-			// host_framerate overrides all else
-			if (host_framerate.value)
-				clframetime = host_framerate.value;
-
-			if (cl.paused || (cl.islocalgame && (key_dest != key_game || key_consoleactive || cl.csqc_paused)))
-				clframetime = 0;
+				if (cl.paused || (cl.islocalgame && (key_dest != key_game || key_consoleactive || cl.csqc_paused)))
+					clframetime = 0;
+			}
 
 			if (cls.timedemo)
 				clframetime = cl.realframetime = cl_timer;
@@ -1008,6 +1019,7 @@ void Host_Main(void)
 			R_TimeReport("client");
 
 			CL_UpdateScreen();
+			CL_MeshEntities_Reset();
 			R_TimeReport("render");
 
 			if (host_speeds.integer)
@@ -1104,7 +1116,7 @@ void Host_LockSession(void)
 	if(locksession_run)
 		return;
 	locksession_run = true;
-	if(locksession.integer != 0)
+	if(locksession.integer != 0 && !COM_CheckParm("-readonly"))
 	{
 		char vabuf[1024];
 		char *p = va(vabuf, sizeof(vabuf), "%slock%s", *fs_userdir ? fs_userdir : fs_basedir, sessionid.string);
@@ -1267,7 +1279,9 @@ static void Host_Init (void)
 
 		R_Modules_Init();
 		Palette_Init();
+#ifdef CONFIG_MENU
 		MR_Init_Commands();
+#endif
 		VID_Shared_Init();
 		VID_Init();
 		Render_Init();
@@ -1302,10 +1316,12 @@ static void Host_Init (void)
 	// 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)
@@ -1345,7 +1361,9 @@ static void Host_Init (void)
 
 	if (!sv.active && !cls.demoplayback && !cls.connect_trying)
 	{
+#ifdef CONFIG_MENU
 		Cbuf_AddText("togglemenu 1\n");
+#endif
 		Cbuf_Execute();
 	}
 
@@ -1397,9 +1415,11 @@ void Host_Shutdown(void)
 	Host_ShutdownServer ();
 	SV_UnlockThreadMutex();
 
+#ifdef CONFIG_MENU
 	// Shutdown menu
 	if(MR_Shutdown)
 		MR_Shutdown();
+#endif
 
 	// AK shutdown PRVM
 	// AK hmm, no PRVM_Shutdown(); yet