X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=host.c;h=55aa68689643ba31d70ee1446be235d2517afd5b;hb=275526b51e0cc486f423539e2aa9473f91bf2b50;hp=a5e620d6b42950dd052d343a56f4dec6e5ca8982;hpb=58fb771fc98f2d04990c947944cd199007ea1666;p=xonotic%2Fdarkplaces.git

diff --git a/host.c b/host.c
index a5e620d6..55aa6868 100644
--- a/host.c
+++ b/host.c
@@ -461,6 +461,8 @@ void SV_DropClient (qboolean crash)
 		MSG_WriteByte (&client->message, host_client - svs.clients);
 		MSG_WriteByte (&client->message, 0);
 	}
+
+	NET_Heartbeat ();
 }
 
 /*
@@ -488,6 +490,9 @@ void Host_ShutdownServer(qboolean crash)
 // stop all client sounds immediately
 	CL_Disconnect ();
 
+	NET_Heartbeat ();
+	NET_Heartbeat ();
+
 // flush any pending messages - like the score!!!
 	start = Sys_DoubleTime();
 	do
@@ -876,32 +881,29 @@ void Host_Init (void)
 
 	if (cls.state != ca_dedicated)
 	{
-		VID_InitCvars();
-
 		Gamma_Init();
-
 		Palette_Init();
-
-#ifndef _WIN32 // on non win32, mouse comes before video for security reasons
-		IN_Init ();
-#endif
-		VID_Init (vid_fullscreen.integer, vid_width.integer, vid_height.integer, vid_bitsperpixel.integer);
+		VID_Shared_Init();
+		VID_Init();
 
 		Render_Init();
 		S_Init ();
 		CDAudio_Init ();
-		Sbar_Init ();
 		CL_Init ();
-#ifdef _WIN32 // on non win32, mouse comes before video for security reasons
-		IN_Init ();
-#endif
 	}
 
 	Cbuf_InsertText ("exec quake.rc\n");
+	Cbuf_Execute ();
+	Cbuf_Execute ();
+	Cbuf_Execute ();
+	Cbuf_Execute ();
 
 	host_initialized = true;
 	
-	Sys_Printf ("========Quake Initialized=========\n");	
+	Con_Printf ("========Quake Initialized=========\n");	
+
+	if (cls.state != ca_dedicated)
+		VID_Open();
 }
 
 
@@ -929,7 +931,6 @@ void Host_Shutdown(void)
 	CDAudio_Shutdown ();
 	NET_Shutdown ();
 	S_Shutdown();
-	IN_Shutdown ();
 
 	if (cls.state != ca_dedicated)
 	{