glossmap textures are now brighter (no change to forced gloss brightness)

[xonotic/darkplaces.git] / host.c

diff --git a/host.c b/host.c
index 55aa68689643ba31d70ee1446be235d2517afd5b..7233970b719aaa728dcc2493a4f23c36fcb702f1 100644 (file)
--- a/host.c
+++ b/host.c
@@ -462,7 +462,7 @@ void SV_DropClient (qboolean crash)
                MSG_WriteByte (&client->message, 0);
        }
 
-       NET_Heartbeat ();
+       NET_Heartbeat (1);
 }
 
 /*
@@ -490,8 +490,8 @@ void Host_ShutdownServer(qboolean crash)
 // stop all client sounds immediately
        CL_Disconnect ();
 
-       NET_Heartbeat ();
-       NET_Heartbeat ();
+       NET_Heartbeat (2);
+       NET_Heartbeat (2);
 
 // flush any pending messages - like the score!!!
        start = Sys_DoubleTime();
@@ -687,6 +687,9 @@ void Host_ServerFrame (void)
 
 // send all messages to the clients
        SV_SendClientMessages ();
+
+// send an heartbeat if enough time has passed since the last one
+       NET_Heartbeat (0);
 }
 
 
@@ -727,6 +730,9 @@ void _Host_Frame (float time)
 // process console commands
        Cbuf_Execute ();
 
+       // LordHavoc: map and load are delayed until video is initialized
+       Host_PerformSpawnServerAndLoadGame();
+
        NET_Poll();
 
 // if running the server locally, make intentions now