Added strlcat and strlcpy, from OpenBSD. They are smart replacements for strncat...

[xonotic/darkplaces.git] / host.c

diff --git a/host.c b/host.c
index 69e3836861998c6e054e8543b3078d93ea4e767b..0f083e98830aaab474d8d12c607bc4612255c92f 100644 (file)
--- a/host.c
+++ b/host.c
@@ -96,8 +96,6 @@ cvar_t temp1 = {0, "temp1","0"};
 cvar_t timestamps = {CVAR_SAVE, "timestamps", "0"};
 cvar_t timeformat = {CVAR_SAVE, "timeformat", "[%b %e %X] "};
 
-cvar_t sv_maxplayers = {0, "maxplayers", "8"};
-
 /*
 ================
 Host_EndGame
@@ -182,6 +180,8 @@ void Host_Error (const char *error, ...)
        longjmp (host_abortserver, 1);
 }
 
+mempool_t *sv_clients_mempool = NULL;
+
 void Host_ServerOptions (void)
 {
        int i, numplayers;
@@ -241,7 +241,9 @@ void Host_ServerOptions (void)
        if (numplayers > 1 && !deathmatch.integer)
                Cvar_SetValueQuick(&deathmatch, 1);
 
-       Cvar_SetValueQuick(&sv_maxplayers, numplayers);
+       svs.maxclients = numplayers;
+       sv_clients_mempool = Mem_AllocPool("server clients");
+       svs.clients = Mem_Alloc(sv_clients_mempool, sizeof(client_t) * svs.maxclients);
 }
 
 /*
@@ -283,8 +285,6 @@ void Host_InitLocal (void)
        Cvar_RegisterVariable (&timestamps);
        Cvar_RegisterVariable (&timeformat);
 
-       Cvar_RegisterVariable(&sv_maxplayers);
-
        Host_ServerOptions ();
 }
 
@@ -358,9 +358,9 @@ void SV_BroadcastPrintf(const char *fmt, ...)
        vsnprintf(string, sizeof(string), fmt,argptr);
        va_end(argptr);
 
-       for (i = 0;i < MAX_SCOREBOARD;i++)
+       for (i = 0, client = svs.clients;i < svs.maxclients;i++, client++)
        {
-               if ((client = svs.connectedclients[i]) && client->spawned)
+               if (client->spawned)
                {
                        MSG_WriteByte(&client->message, svc_print);
                        MSG_WriteString(&client->message, string);
@@ -436,9 +436,9 @@ void SV_DropClient(qboolean crash)
        }
 
        // send notification to all clients
-       for (i = 0;i < MAX_SCOREBOARD;i++)
+       for (i = 0, client = svs.clients;i < svs.maxclients;i++, client++)
        {
-               if (!(client = svs.connectedclients[i]))
+               if (!client->active)
                        continue;
                MSG_WriteByte(&client->message, svc_updatename);
                MSG_WriteByte(&client->message, host_client->number);
@@ -456,9 +456,8 @@ void SV_DropClient(qboolean crash)
        // free the client now
        if (host_client->entitydatabase4)
                EntityFrame4_FreeDatabase(host_client->entitydatabase4);
-       // remove the index reference
-       svs.connectedclients[host_client->number] = NULL;
-       Mem_Free(host_client);
+       // clear the client struct (this sets active to false)
+       memset(host_client, 0, sizeof(*host_client));
 }
 
 /*
@@ -473,7 +472,6 @@ void Host_ShutdownServer(qboolean crash)
        int i, count;
        sizebuf_t buf;
        char message[4];
-       double start;
 
        if (!sv.active)
                return;
@@ -489,32 +487,6 @@ void Host_ShutdownServer(qboolean crash)
        NetConn_Heartbeat(2);
        NetConn_Heartbeat(2);
 
-// flush any pending messages - like the score!!!
-       start = Sys_DoubleTime();
-       do
-       {
-               count = 0;
-               NetConn_ClientFrame();
-               NetConn_ServerFrame();
-               for (i = 0;i < MAX_SCOREBOARD;i++)
-               {
-                       host_client = svs.connectedclients[i];
-                       if (host_client && host_client->message.cursize)
-                       {
-                               if (NetConn_CanSendMessage(host_client->netconnection))
-                               {
-                                       NetConn_SendReliableMessage(host_client->netconnection, &host_client->message);
-                                       SZ_Clear(&host_client->message);
-                               }
-                               else
-                                       count++;
-                       }
-               }
-               if ((Sys_DoubleTime() - start) > 3.0)
-                       break;
-       }
-       while(count);
-
 // make sure all the clients know we're disconnecting
        buf.data = message;
        buf.maxsize = 4;
@@ -524,8 +496,8 @@ void Host_ShutdownServer(qboolean crash)
        if (count)
                Con_Printf("Host_ShutdownServer: NetConn_SendToAll failed for %u clients\n", count);
 
-       for (i = 0;i < MAX_SCOREBOARD;i++)
-               if ((host_client = svs.connectedclients[i]))
+       for (i = 0, host_client = svs.clients;i < svs.maxclients;i++, host_client++)
+               if (host_client->active)
                        SV_DropClient(crash); // server shutdown
 
        NetConn_CloseServerPorts();
@@ -534,6 +506,7 @@ void Host_ShutdownServer(qboolean crash)
 // clear structures
 //
        memset(&sv, 0, sizeof(sv));
+       memset(svs.clients, 0, svs.maxclients*sizeof(client_t));
 }
 
 
@@ -568,7 +541,7 @@ Returns false if the time is too short to run a frame
 extern cvar_t cl_avidemo;
 qboolean Host_FilterTime (double time)
 {
-       double timecap;
+       double timecap, timeleft;
        realtime += time;
 
        if (slowmo.value < 0.0f)
@@ -581,21 +554,24 @@ qboolean Host_FilterTime (double time)
                Cvar_SetValue("cl_avidemo", 0.0f);
 
        // check if framerate is too high
-       if (cl_avidemo.value >= 0.1f)
+       if (!cls.timedemo)
        {
-               timecap = 1.0 / (double)cl_avidemo.value;
-               if ((realtime - oldrealtime) < timecap)
-                       return false;
-       }
-       else if (!cls.timedemo)
-       {
-               // default to sys_ticrate (server framerate - presumably low) unless we're the active window and either connected to a server or playing a video
+               // default to sys_ticrate (server framerate - presumably low) unless we
+               // have a good reason to run faster
                timecap = sys_ticrate.value;
-               if (vid_activewindow && (cls.state == ca_connected || cl_videoplaying))
+               if (cl_avidemo.value >= 0.1f)
+                       timecap = 1.0 / (double)cl_avidemo.value;
+               else if (vid_activewindow && !scr_con_current)
                        timecap = 1.0 / host_maxfps.value;
 
-               if ((realtime - oldrealtime) < timecap)
+               timeleft = oldrealtime + timecap - realtime;
+               if (timeleft > 0)
+               {
+                       // don't totally hog the CPU
+                       if (timeleft >= 0.02)
+                               Sys_Sleep();
                        return false;
+               }
        }
 
        // LordHavoc: copy into host_realframetime as well
@@ -712,11 +688,7 @@ void _Host_Frame (float time)
 
        // decide the simulation time
        if (!Host_FilterTime(time))
-       {
-               // if time was rejected, don't totally hog the CPU
-               Sys_Sleep();
                return;
-       }
 
        cl.islocalgame = NetConn_IsLocalGame();
 
@@ -835,9 +807,11 @@ void Host_Frame (float time)
        timecount = 0;
        timetotal = 0;
        c = 0;
-       for (i = 0;i < MAX_SCOREBOARD;i++)
-               if (svs.connectedclients[i])
+       for (i=0 ; i<svs.maxclients ; i++)
+       {
+               if (svs.clients[i].active)
                        c++;
+       }
 
        Con_Printf ("serverprofile: %2i clients %2i msec\n",  c,  m);
 }
@@ -871,7 +845,6 @@ void Host_Init (void)
        V_Init();
        COM_Init();
        Host_InitLocal();
-       W_LoadWadFile("gfx.wad");
        Key_Init();
        Con_Init();
        Chase_Init();
@@ -906,7 +879,10 @@ void Host_Init (void)
        Con_DPrintf ("========Initialized=========\n");
 
        if (cls.state != ca_dedicated)
+       {
                VID_Open();
+               SCR_BeginLoadingPlaque();
+       }
 }