Adding the new vm

[xonotic/darkplaces.git] / sv_main.c

diff --git a/sv_main.c b/sv_main.c
index 109f87ff514bee9272604642485eaa673f20f498..8332e7351d658b79f4e02bf11fa921f04d427e7b 100644 (file)
--- a/sv_main.c
+++ b/sv_main.c
@@ -254,7 +254,7 @@ void SV_SendServerinfo (client_t *client)
        client->entitydatabase4 = EntityFrame4_AllocDatabase(sv_clients_mempool);
 
        MSG_WriteByte (&client->message, svc_print);
-       sprintf (message, "\002\nServer: %s build %s (progs %i crc)", gamename, buildstring, pr_crc);
+       snprintf (message, sizeof (message), "\002\nServer: %s build %s (progs %i crc)", gamename, buildstring, pr_crc);
        MSG_WriteString (&client->message,message);
 
        MSG_WriteByte (&client->message, svc_serverinfo);
@@ -985,6 +985,16 @@ void SV_WriteEntitiesToClient(client_t *client, edict_t *clent, sizebuf_t *msg)
        buf.data = data;
        buf.maxsize = sizeof(data);
 
+       d = client->entitydatabase4;
+
+       for (i = 0;i < MAX_ENTITY_HISTORY;i++)
+               if (!d->commit[i].numentities)
+                       break;
+       // if commit buffer full, just don't bother writing an update this frame
+       if (i == MAX_ENTITY_HISTORY)
+               return;
+       d->currentcommit = d->commit + i;
+
        // this state's number gets played around with later
        ClearStateToDefault(&inactiveentitystate);
        //inactiveentitystate = defaultstate;
@@ -1021,17 +1031,23 @@ void SV_WriteEntitiesToClient(client_t *client, edict_t *clent, sizebuf_t *msg)
        for (i = 0;i < numsendentities;i++)
                SV_MarkWriteEntityStateToClient(sendentities + i);
 
-       d = client->entitydatabase4;
        // calculate maximum bytes to allow in this packet
        // deduct 4 to account for the end data
        maxbytes = min(msg->maxsize, MAX_PACKETFRAGMENT) - 4;
 
-       d->currentcommit = d->commit + EntityFrame4_SV_ChooseCommitToReplace(d);
        d->currentcommit->numentities = 0;
        d->currentcommit->framenum = ++client->entityframenumber;
        MSG_WriteByte(msg, svc_entities);
        MSG_WriteLong(msg, d->referenceframenum);
        MSG_WriteLong(msg, d->currentcommit->framenum);
+       if (developer_networkentities.integer >= 1)
+       {
+               Con_Printf("send svc_entities ref:%i num:%i (database: ref:%i commits:", d->referenceframenum, d->currentcommit->framenum, d->referenceframenum);
+               for (i = 0;i < MAX_ENTITY_HISTORY;i++)
+                       if (d->commit[i].numentities)
+                               Con_Printf(" %i", d->commit[i].framenum);
+               Con_Printf(")\n");
+       }
        if (d->currententitynumber >= sv.max_edicts)
                startnumber = 1;
        else
@@ -1354,7 +1370,7 @@ void SV_UpdateToReliableMessages (void)
                        if (s == NULL)
                                s = "";
                        // point the string back at host_client->name to keep it safe
-                       strncpy(host_client->name, s, sizeof(host_client->name) - 1);
+                       strlcpy (host_client->name, s, sizeof (host_client->name));
                        sv_player->v->netname = PR_SetString(host_client->name);
                }
                if ((val = GETEDICTFIELDVALUE(sv_player, eval_clientcolors)) && host_client->colors != val->_float)
@@ -1759,7 +1775,7 @@ void SV_SpawnServer (const char *server)
 
        memset (&sv, 0, sizeof(sv));
 
-       strcpy (sv.name, server);
+       strlcpy (sv.name, server, sizeof (sv.name));
 
 // load progs to get entity field count
        PR_LoadProgs ();
@@ -1808,8 +1824,8 @@ void SV_SpawnServer (const char *server)
 
        Mod_ClearUsed();
 
-       strcpy (sv.name, server);
-       sprintf (sv.modelname,"maps/%s.bsp", server);
+       strlcpy (sv.name, server, sizeof (sv.name));
+       snprintf (sv.modelname, sizeof (sv.modelname), "maps/%s.bsp", server);
        sv.worldmodel = Mod_ForName(sv.modelname, false, true, true);
        if (!sv.worldmodel)
        {