X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=host.c;h=924e655e200bb679da3afd9478df5ea69a21e3f2;hb=44062df4df97288f0c76edd003f4e6d809add1c3;hp=543ab5a6720731196b8e9cfaae02e231c47202b9;hpb=6b6279b585b0c84cbb109a26121027f5e6b723b0;p=xonotic%2Fdarkplaces.git

diff --git a/host.c b/host.c
index 543ab5a6..924e655e 100644
--- a/host.c
+++ b/host.c
@@ -156,7 +156,7 @@ static void Host_Quit_f(cmd_state_t *cmd)
 
 static void Host_Version_f(cmd_state_t *cmd)
 {
-	Con_Printf("Version: %s build %s\n", gamename, buildstring);
+	Con_Printf("Version: %s\n", engineversion);
 }
 
 static void Host_Framerate_c(cvar_t *var)
@@ -365,7 +365,6 @@ Host_Init
 static void Host_Init (void)
 {
 	int i;
-	const char* os;
 	char vabuf[1024];
 
 	host.hook.ConnectLocal = NULL;
@@ -445,8 +444,7 @@ static void Host_Init (void)
 	FS_Init();
 
 	// construct a version string for the corner of the console
-	os = DP_OS_NAME;
-	dpsnprintf (engineversion, sizeof (engineversion), "%s %s %s", gamename, os, buildstring);
+	dpsnprintf (engineversion, sizeof (engineversion), "%s %s%s, buildstring: %s", gamename, DP_OS_NAME, cls.state == ca_dedicated ? " dedicated" : "", buildstring);
 	Con_Printf("%s\n", engineversion);
 
 	// initialize process nice level
@@ -503,6 +501,7 @@ static void Host_Init (void)
 	{
 		// put up the loading image so the user doesn't stare at a black screen...
 		SCR_BeginLoadingPlaque(true);
+		S_Startup();
 #ifdef CONFIG_MENU
 		MR_Init();
 #endif
@@ -643,40 +642,42 @@ static double Host_Frame(double time)
 	// Run any downloads
 	Curl_Frame();
 
+	// get new SDL events and add commands from keybindings to the cbuf
+	Sys_SDL_HandleEvents();
+
 	// process console commands
 	Cbuf_Frame(host.cbuf);
 
 	R_TimeReport("---");
 
-	sv_wait = SV_Frame(time);
-	cl_wait = CL_Frame(time);
-
-//	Con_Printf("%6.0f %6.0f\n", cl_wait * 1000000.0, sv_wait * 1000000.0);
+	// if the accumulators haven't become positive yet, wait a while
+	sv_wait = - SV_Frame(time);
+	cl_wait = - CL_Frame(time);
 
 	Mem_CheckSentinelsGlobal();
 
-	if(host.restless)
-		return 0;
-
-	// if the accumulators haven't become positive yet, wait a while
 	if (cls.state == ca_dedicated)
-		return sv_wait * -1000000.0; // dedicated
+		return sv_wait; // dedicated
 	else if (!sv.active || svs.threaded)
-		return cl_wait * -1000000.0; // connected to server, main menu, or server is on different thread
+		return cl_wait; // connected to server, main menu, or server is on different thread
 	else
-		return max(cl_wait, sv_wait) * -1000000.0; // listen server or singleplayer
+		return min(cl_wait, sv_wait); // listen server or singleplayer
 }
 
-static inline void Host_Sleep(double time)
+static inline double Host_Sleep(double time)
 {
 	double delta, time0;
 
+	// convert to microseconds
+	time *= 1000000.0;
+
+	if (time < 1 || host.restless)
+		return 0; // not sleeping this frame
+
 	if(host_maxwait.value <= 0)
 		time = min(time, 1000000.0);
 	else
 		time = min(time, host_maxwait.value * 1000.0);
-	if(time < 1)
-		time = 1; // because we cast to int
 
 	time0 = Sys_DirtyTime();
 	if (sv_checkforpacketsduringsleep.integer && !sys_usenoclockbutbenchmark.integer && !svs.threaded) {
@@ -691,12 +692,13 @@ static inline void Host_Sleep(double time)
 			Curl_Select(&time);
 		Sys_Sleep((int)time);
 	}
+
 	delta = Sys_DirtyTime() - time0;
 	if (delta < 0 || delta >= 1800)
 		delta = 0;
-	host.sleeptime += delta;
-//			R_TimeReport("sleep");
-	return;
+
+//	R_TimeReport("sleep");
+	return delta;
 }
 
 // Cloudwalk: Most overpowered function declaration...
@@ -722,7 +724,7 @@ static inline double Host_UpdateTime (double newtime, double oldtime)
 
 void Host_Main(void)
 {
-	double time, newtime, oldtime, sleeptime;
+	double time, oldtime, sleeptime;
 
 	Host_Init(); // Start!
 
@@ -739,19 +741,15 @@ void Host_Main(void)
 			continue;
 		}
 
-		newtime = host.dirtytime = Sys_DirtyTime();
-		host.realtime += time = Host_UpdateTime(newtime, oldtime);
+		host.dirtytime = Sys_DirtyTime();
+		host.realtime += time = Host_UpdateTime(host.dirtytime, oldtime);
 
 		sleeptime = Host_Frame(time);
-		oldtime = newtime;
-
-		if (sleeptime >= 1)
-		{
-			Host_Sleep(sleeptime);
-			continue;
-		}
+		oldtime = host.dirtytime;
+		++host.framecount;
 
-		host.framecount++;
+		sleeptime -= Sys_DirtyTime() - host.dirtytime; // execution time
+		host.sleeptime = Host_Sleep(sleeptime);
 	}
 
 	return;