X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=host.c;h=e51b3914fe6909cb8b40724cd3bab835e5888e47;hb=43ccc403e08b7b72eb687f2d3700e14ea078d30a;hp=09144230b9fbfdefd53dfcaef59c4fe3154e765f;hpb=d39861bfe72a5a9ec8cfbcc83457db58a74b75d9;p=xonotic%2Fdarkplaces.git

diff --git a/host.c b/host.c
index 09144230..e51b3914 100644
--- a/host.c
+++ b/host.c
@@ -72,8 +72,8 @@ cvar_t cl_maxfps_alwayssleep = {0, "cl_maxfps_alwayssleep","1", "gives up some p
 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 = {CVAR_SAVE, "developer","0", "prints debugging messages and information (recommended for all developers and level designers)"};
-cvar_t developer_extra = {0, "developer_extra", "prints additional debugging messages, often very verbose!"};
-cvar_t developer_insane = {0, "developer_insane", "prints huge streams of information about internal workings, entire contents of files being read/written, etc.  Not recommended!"};
+cvar_t developer_extra = {0, "developer_extra", "0", "prints additional debugging messages, often very verbose!"};
+cvar_t developer_insane = {0, "developer_insane", "0", "prints huge streams of information about internal workings, entire contents of files being read/written, etc.  Not recommended!"};
 cvar_t developer_loadfile = {0, "developer_loadfile","0", "prints name and size of every file loaded via the FS_LoadFile function (which is almost everything)"};
 cvar_t developer_loading = {0, "developer_loading","0", "prints information about files as they are loaded or unloaded successfully"};
 cvar_t developer_entityparsing = {0, "developer_entityparsing", "0", "prints detailed network entities information each time a packet is received"};
@@ -271,11 +271,11 @@ void Host_SaveConfig_to(const char *file)
 }
 void Host_SaveConfig(void)
 {
-	Host_SaveConfig_to("config.cfg");
+	Host_SaveConfig_to(CONFIGFILENAME);
 }
 void Host_SaveConfig_f(void)
 {
-	const char *file = "config.cfg";
+	const char *file = CONFIGFILENAME;
 
 	if(Cmd_Argc() >= 2) {
 		file = Cmd_Argv(1);
@@ -297,7 +297,7 @@ 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");
+	Cbuf_InsertText("cvar_resettodefaults_all;exec " STARTCONFIGFILENAME "\n");
 }
 
 /*
@@ -660,7 +660,7 @@ void Host_Main(void)
 				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)
+			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;
 		}
@@ -700,8 +700,10 @@ void Host_Main(void)
 		if (sv.active ? sv_timer > 0 : cl_timer > 0)
 		{
 			// process console commands
+//			R_TimeReport("preconsole");
 			CL_VM_PreventInformationLeaks();
 			Cbuf_Execute();
+//			R_TimeReport("console");
 		}
 
 		//Con_Printf("%6.0f %6.0f\n", cl_timer * 1000000.0, sv_timer * 1000000.0);
@@ -718,14 +720,17 @@ void Host_Main(void)
 		if (!cls.timedemo && wait >= 1)
 		{
 			double time0 = Sys_DoubleTime();
-			if (sv_checkforpacketsduringsleep.integer)
+			if (sv_checkforpacketsduringsleep.integer && !sys_usenoclockbutbenchmark.integer)
 				NetConn_SleepMicroseconds((int)wait);
 			else
 				Sys_Sleep((int)wait);
 			svs.perf_acc_sleeptime += Sys_DoubleTime() - time0;
+//			R_TimeReport("sleep");
 			continue;
 		}
 
+		R_TimeReport("---");
+
 	//-------------------
 	//
 	// server operations
@@ -812,6 +817,7 @@ void Host_Main(void)
 				if (framelimit > 1 && Sys_DoubleTime() >= aborttime)
 					break;
 			}
+			R_TimeReport("serverphysics");
 
 			// send all messages to the clients
 			SV_SendClientMessages();
@@ -826,6 +832,13 @@ void Host_Main(void)
 
 			// send an heartbeat if enough time has passed since the last one
 			NetConn_Heartbeat(0);
+			R_TimeReport("servernetwork");
+		}
+		else
+		{
+			// don't let r_speeds display jump around
+			R_TimeReport("serverphysics");
+			R_TimeReport("servernetwork");
 		}
 
 	//-------------------
@@ -836,6 +849,7 @@ void Host_Main(void)
 
 		if (cls.state != ca_dedicated && (cl_timer > 0 || cls.timedemo || ((vid_activewindow ? cl_maxfps : cl_maxidlefps).value < 1)))
 		{
+			R_TimeReport("---");
 			// decide the simulation time
 			if (cls.capturevideo.active)
 			{
@@ -891,26 +905,35 @@ void Host_Main(void)
 			// update video
 			if (host_speeds.integer)
 				time1 = Sys_DoubleTime();
+			R_TimeReport("pre-input");
 
 			// Collect input into cmd
 			CL_Input();
 
+			R_TimeReport("input");
+
 			// check for new packets
 			NetConn_ClientFrame();
 
 			// read a new frame from a demo if needed
 			CL_ReadDemoMessage();
+			R_TimeReport("clientnetwork");
 
 			// now that packets have been read, send input to server
 			CL_SendMove();
+			R_TimeReport("sendmove");
 
 			// update client world (interpolate entities, create trails, etc)
 			CL_UpdateWorld();
+			R_TimeReport("lerpworld");
 
 			CL_Video_Frame();
 			CL_Gecko_Frame();
 
+			R_TimeReport("client");
+
 			CL_UpdateScreen();
+			R_TimeReport("render");
 
 			if (host_speeds.integer)
 				time2 = Sys_DoubleTime();
@@ -925,6 +948,7 @@ void Host_Main(void)
 				S_Update(&r_refdef.view.matrix);
 
 			CDAudio_Update();
+			R_TimeReport("audio");
 
 			// reset gathering of mouse input
 			in_mouse_x = in_mouse_y = 0;
@@ -982,6 +1006,7 @@ 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);
@@ -1006,7 +1031,7 @@ static void Host_Init (void)
 	if (COM_CheckParm("-benchmark"))
 		srand(0); // predictable random sequence for -benchmark
 	else
-		srand(time(NULL));
+		srand((unsigned int)time(NULL));
 
 	// FIXME: this is evil, but possibly temporary
 	// LordHavoc: doesn't seem very temporary...
@@ -1059,6 +1084,9 @@ static void Host_Init (void)
 	// 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();
 
@@ -1107,19 +1135,19 @@ static void Host_Init (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_AddText("alias startmap_sp \"map nehstart\"\nalias startmap_dm \"map nehstart\"\nexec quake.rc\n");
+		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 quake.rc\n");
+		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 quake.rc\n");
+		Cbuf_AddText("alias startmap_sp \"map start\"\nalias startmap_dm \"map start\"\nexec " STARTCONFIGFILENAME "\n");
 	Cbuf_Execute();
 
 	// if stuffcmds wasn't run, then quake.rc is probably missing, use default
 	if (!host_stuffcmdsrun)
 	{
-		Cbuf_AddText("exec default.cfg\nexec config.cfg\nexec autoexec.cfg\nstuffcmds\n");
+		Cbuf_AddText("exec default.cfg\nexec " CONFIGFILENAME "\nexec autoexec.cfg\nstuffcmds\n");
 		Cbuf_Execute();
 	}