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

diff --git a/host.c b/host.c
index a20903a9..3274be80 100644
--- a/host.c
+++ b/host.c
@@ -133,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;
 
@@ -156,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)
@@ -365,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;
@@ -445,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
@@ -503,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
@@ -607,7 +613,7 @@ void Host_Shutdown(void)
 	TaskQueue_Shutdown();
 	Thread_Shutdown();
 	Cmd_Shutdown();
-	Sys_Shutdown();
+	Sys_SDL_Shutdown();
 	Log_Close();
 	Crypto_Shutdown();
 
@@ -644,7 +650,7 @@ static double Host_Frame(double time)
 	Curl_Frame();
 
 	// get new SDL events and add commands from keybindings to the cbuf
-	Sys_SendKeyEvents();
+	Sys_SDL_HandleEvents();
 
 	// process console commands
 	Cbuf_Frame(host.cbuf);
@@ -665,43 +671,6 @@ static double Host_Frame(double time)
 		return min(cl_wait, sv_wait); // listen server or singleplayer
 }
 
-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);
-
-	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;
-
-//	R_TimeReport("sleep");
-	return delta;
-}
-
 // Cloudwalk: Most overpowered function declaration...
 static inline double Host_UpdateTime (double newtime, double oldtime)
 {
@@ -744,13 +713,12 @@ void Host_Main(void)
 
 		host.dirtytime = Sys_DirtyTime();
 		host.realtime += time = Host_UpdateTime(host.dirtytime, oldtime);
+		oldtime = host.dirtytime;
 
 		sleeptime = Host_Frame(time);
-		oldtime = host.dirtytime;
 		++host.framecount;
-
 		sleeptime -= Sys_DirtyTime() - host.dirtytime; // execution time
-		host.sleeptime = Host_Sleep(sleeptime);
+		host.sleeptime = Sys_Sleep(sleeptime);
 	}
 
 	return;