X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=host.c;h=7e7bc56a7f2950de8df0e6c6a9ffa52273338326;hp=7bc799dd8b37a30a4e4c79e89b301358aec05b9b;hb=8ab339588b127e88e27bfa08f6eccbf9400b51f9;hpb=29d6f023ba9ed6a6660aeb574ea384a07c38e9c9

diff --git a/host.c b/host.c
index 7bc799dd..7e7bc56a 100644
--- a/host.c
+++ b/host.c
@@ -23,7 +23,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <time.h>
 #include "libcurl.h"
+#ifdef CONFIG_CD
 #include "cdaudio.h"
+#endif
 #include "cl_video.h"
 #include "progsvm.h"
 #include "csprogs.h"
@@ -150,7 +152,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 +212,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 +340,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 +483,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 +679,7 @@ void Host_Main(void)
 	Host_Init();
 
 	realtime = 0;
+	host_dirtytime = Sys_DirtyTime();
 	for (;;)
 	{
 		if (setjmp(host_abortframe))
@@ -709,7 +716,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 +804,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 +936,7 @@ void Host_Main(void)
 		{
 			R_TimeReport("---");
 			Collision_Cache_NewFrame();
-			R_TimeReport("collisioncache");
+			R_TimeReport("photoncache");
 			// decide the simulation time
 			if (cls.capturevideo.active)
 			{
@@ -1024,8 +1035,10 @@ void Host_Main(void)
 			else
 				S_Update(&r_refdef.view.matrix);
 
+#ifdef CONFIG_CD
 			CDAudio_Update();
 			R_TimeReport("audio");
+#endif
 
 			// reset gathering of mouse input
 			in_mouse_x = in_mouse_y = 0;
@@ -1073,7 +1086,9 @@ void Host_StartVideo(void)
 		// 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();
 		VID_Start();
+#ifdef CONFIG_CD
 		CDAudio_Startup();
+#endif
 	}
 }
 
@@ -1106,7 +1121,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);
@@ -1269,12 +1284,16 @@ static void Host_Init (void)
 
 		R_Modules_Init();
 		Palette_Init();
+#ifdef CONFIG_MENU
 		MR_Init_Commands();
+#endif
 		VID_Shared_Init();
 		VID_Init();
 		Render_Init();
 		S_Init();
+#ifdef CONFIG_CD
 		CDAudio_Init();
+#endif
 		Key_Init();
 		CL_Init();
 	}
@@ -1304,10 +1323,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)
@@ -1347,7 +1368,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();
 	}
 
@@ -1399,9 +1422,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
@@ -1410,7 +1435,9 @@ void Host_Shutdown(void)
 
 	Host_SaveConfig();
 
+#ifdef CONFIG_CD
 	CDAudio_Shutdown ();
+#endif
 	S_Terminate ();
 	Curl_Shutdown ();
 	NetConn_Shutdown ();