X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=host.c;h=3274be807cd098c522c2953c076f25092f7e3327;hb=cd51987a9fd5813e15dfb442b7ded432173390f9;hp=43bfb2ff9cdf39ebbf5fe350abc7c74497667d50;hpb=fc04b7c05c8f66d33f0d843f3fbbc9f161e3c743;p=xonotic%2Fdarkplaces.git

diff --git a/host.c b/host.c
index 43bfb2ff..3274be80 100644
--- a/host.c
+++ b/host.c
@@ -42,7 +42,6 @@ host_static_t host;
 
 // pretend frames take this amount of time (in seconds), 0 = realtime
 cvar_t host_framerate = {CF_CLIENT | CF_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"};
-cvar_t cl_maxphysicsframesperserverframe = {CF_CLIENT, "cl_maxphysicsframesperserverframe","10", "maximum number of physics frames per server frame"};
 // shows time used by certain subsystems
 cvar_t host_speeds = {CF_CLIENT | CF_SERVER, "host_speeds","0", "reports how much time is used in server/graphics/sound"};
 cvar_t host_maxwait = {CF_CLIENT | CF_SERVER, "host_maxwait","1000", "maximum sleep time requested from the operating system in millisecond. Larger sleeps will be done using multiple host_maxwait length sleeps. Lowering this value will increase CPU load, but may help working around problems with accuracy of sleep times."};
@@ -134,6 +133,9 @@ void Host_Error (const char *error, ...)
 	if (cls.state == ca_dedicated)
 		Sys_Error ("Host_Error: %s",hosterrorstring2);	// dedicated servers exit
 
+	// prevent an endless loop if the error was triggered by a command
+	Cbuf_Clear(cmd_local->cbuf);
+
 	CL_Disconnect();
 	cls.demonum = -1;
 
@@ -157,7 +159,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)
@@ -270,7 +272,6 @@ static void Host_InitLocal (void)
 	Cmd_AddCommand(CF_SHARED, "saveconfig", Host_SaveConfig_f, "save settings to config.cfg (or a specified filename) immediately (also automatic when quitting)");
 	Cmd_AddCommand(CF_SHARED, "loadconfig", Host_LoadConfig_f, "reset everything and reload configs");
 	Cmd_AddCommand(CF_SHARED, "sendcvar", SendCvar_f, "sends the value of a cvar to the server as a sentcvar command, for use by QuakeC");
-	Cvar_RegisterVariable (&cl_maxphysicsframesperserverframe);
 	Cvar_RegisterVariable (&host_framerate);
 	Cvar_RegisterCallback (&host_framerate, Host_Framerate_c);
 	Cvar_RegisterVariable (&host_speeds);
@@ -367,9 +368,12 @@ Host_Init
 static void Host_Init (void)
 {
 	int i;
-	const char* os;
 	char vabuf[1024];
 
+	Sys_SDL_Init();
+
+	Memory_Init();
+
 	host.hook.ConnectLocal = NULL;
 	host.hook.Disconnect = NULL;
 	host.hook.ToggleMenu = NULL;
@@ -447,8 +451,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
@@ -505,6 +508,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
@@ -609,7 +613,7 @@ void Host_Shutdown(void)
 	TaskQueue_Shutdown();
 	Thread_Shutdown();
 	Cmd_Shutdown();
-	Sys_Shutdown();
+	Sys_SDL_Shutdown();
 	Log_Close();
 	Crypto_Shutdown();
 
@@ -645,60 +649,26 @@ 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
-}
-
-static inline void Host_Sleep(double time)
-{
-	double delta, time0;
-
-	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) {
-		NetConn_SleepMicroseconds((int)time);
-		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
-	{
-		if (cls.state != ca_dedicated)
-			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;
+		return min(cl_wait, sv_wait); // listen server or singleplayer
 }
 
 // Cloudwalk: Most overpowered function declaration...
@@ -724,7 +694,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!
 
@@ -741,19 +711,14 @@ 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);
+		oldtime = host.dirtytime;
 
 		sleeptime = Host_Frame(time);
-		oldtime = newtime;
-
-		if (sleeptime >= 1)
-		{
-			Host_Sleep(sleeptime);
-			continue;
-		}
-
-		host.framecount++;
+		++host.framecount;
+		sleeptime -= Sys_DirtyTime() - host.dirtytime; // execution time
+		host.sleeptime = Sys_Sleep(sleeptime);
 	}
 
 	return;