fix two signed/unsigned comparison warnings

[xonotic/darkplaces.git] / sv_main.c

diff --git a/sv_main.c b/sv_main.c
index 7f1b6a908794184cac90f2bc8c98b655e4d8c1d2..97669a558e535bfab93c5cc3e259b574eb3fc5e8 100644 (file)
--- a/sv_main.c
+++ b/sv_main.c
@@ -37,6 +37,7 @@ mempool_t *sv_edicts_mempool = NULL;
 
 extern void SV_Phys_Init (void);
 extern void SV_World_Init (void);
+static void SV_SaveEntFile_f(void);
 
 /*
 ===============
@@ -47,6 +48,7 @@ void SV_Init (void)
 {
        int i;
 
+       Cmd_AddCommand("sv_saveentfile", SV_SaveEntFile_f);
        Cvar_RegisterVariable (&sv_maxvelocity);
        Cvar_RegisterVariable (&sv_gravity);
        Cvar_RegisterVariable (&sv_friction);
@@ -72,6 +74,18 @@ void SV_Init (void)
        sv_edicts_mempool = Mem_AllocPool("server edicts");
 }
 
+static void SV_SaveEntFile_f(void)
+{
+       char basename[MAX_QPATH];
+       if (!sv.active || !sv.worldmodel)
+       {
+               Con_Printf("Not running a server\n");
+               return;
+       }
+       FS_StripExtension(sv.worldmodel->name, basename, sizeof(basename));
+       FS_WriteFile(va("%s.ent", basename), sv.worldmodel->brush.entities, strlen(sv.worldmodel->brush.entities));
+}
+
 /*
 =============================================================================
 
@@ -258,7 +272,7 @@ void SV_SendServerinfo (client_t *client)
        MSG_WriteString (&client->message,message);
 
        MSG_WriteByte (&client->message, svc_serverinfo);
-       MSG_WriteLong (&client->message, PROTOCOL_DARKPLACES4);
+       MSG_WriteLong (&client->message, PROTOCOL_DARKPLACES5);
        MSG_WriteByte (&client->message, svs.maxclients);
 
        if (!coop.integer && deathmatch.integer)
@@ -791,7 +805,40 @@ void SV_PrepareEntitiesForSending(void)
                if (cs.viewmodelforclient)
                        cs.flags |= RENDER_VIEWMODEL; // show relative to the view
 
+               f = GETEDICTFIELDVALUE(ent, eval_color)->vector[0]*256;
+               cs.light[0] = (unsigned short)bound(0, f, 65535);
+               f = GETEDICTFIELDVALUE(ent, eval_color)->vector[1]*256;
+               cs.light[1] = (unsigned short)bound(0, f, 65535);
+               f = GETEDICTFIELDVALUE(ent, eval_color)->vector[2]*256;
+               cs.light[2] = (unsigned short)bound(0, f, 65535);
+               f = GETEDICTFIELDVALUE(ent, eval_light_lev)->_float;
+               cs.light[3] = (unsigned short)bound(0, f, 65535);
+               cs.lightstyle = (qbyte)GETEDICTFIELDVALUE(ent, eval_style)->_float;
+               cs.lightpflags = (qbyte)GETEDICTFIELDVALUE(ent, eval_pflags)->_float;
+
+               if (gamemode == GAME_TENEBRAE)
+               {
+                       // tenebrae's EF_FULLDYNAMIC conflicts with Q2's EF_NODRAW
+                       if (cs.effects & 16)
+                       {
+                               cs.effects &= ~16;
+                               cs.lightpflags |= PFLAGS_FULLDYNAMIC;
+                       }
+                       // tenebrae's EF_GREEN conflicts with DP's EF_ADDITIVE
+                       if (cs.effects & 32)
+                       {
+                               cs.effects &= ~32;
+                               cs.light[0] = 0.2;
+                               cs.light[1] = 1;
+                               cs.light[2] = 0.2;
+                               cs.light[3] = 200;
+                               cs.lightpflags |= PFLAGS_FULLDYNAMIC;
+                       }
+               }
+
                cs.specialvisibilityradius = 0;
+               if (cs.lightpflags & PFLAGS_FULLDYNAMIC)
+                       cs.specialvisibilityradius = max(cs.specialvisibilityradius, cs.light[3]);
                if (cs.glowsize)
                        cs.specialvisibilityradius = max(cs.specialvisibilityradius, cs.glowsize * 4);
                if (cs.flags & RENDER_GLOWTRAIL)
@@ -976,10 +1023,15 @@ void SV_WriteEntitiesToClient(client_t *client, edict_t *clent, sizebuf_t *msg)
        vec3_t testorigin;
        entity_state_t *s;
        entity_database4_t *d;
-       int maxbytes, n, startnumber;
+       int n, startnumber;
        entity_state_t *e, inactiveentitystate;
        sizebuf_t buf;
        qbyte data[128];
+
+       // if there isn't enough space to accomplish anything, skip it
+       if (msg->cursize + 24 > msg->maxsize)
+               return;
+
        // prepare the buffer
        memset(&buf, 0, sizeof(buf));
        buf.data = data;
@@ -1031,10 +1083,6 @@ void SV_WriteEntitiesToClient(client_t *client, edict_t *clent, sizebuf_t *msg)
        for (i = 0;i < numsendentities;i++)
                SV_MarkWriteEntityStateToClient(sendentities + i);
 
-       // 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->numentities = 0;
        d->currentcommit->framenum = ++client->entityframenumber;
        MSG_WriteByte(msg, svc_entities);
@@ -1092,7 +1140,7 @@ void SV_WriteEntitiesToClient(client_t *client, edict_t *clent, sizebuf_t *msg)
                        }
                }
                // if the commit is full, we're done this frame
-               if (msg->cursize + buf.cursize > maxbytes)
+               if (msg->cursize + buf.cursize > msg->maxsize - 4)
                {
                        // next frame we will continue where we left off
                        break;
@@ -1269,9 +1317,9 @@ void SV_WriteClientdataToMessage (edict_t *ent, sizebuf_t *msg)
                if (bits & (SU_PUNCH1<<i))
                        MSG_WritePreciseAngle(msg, ent->v->punchangle[i]); // PROTOCOL_DARKPLACES
                if (bits & (SU_PUNCHVEC1<<i)) // PROTOCOL_DARKPLACES
-                       MSG_WriteDPCoord(msg, punchvector[i]); // PROTOCOL_DARKPLACES
+                       MSG_WriteFloat(msg, punchvector[i]); // PROTOCOL_DARKPLACES
                if (bits & (SU_VELOCITY1<<i))
-                       MSG_WriteChar (msg, ent->v->velocity[i]/16);
+                       MSG_WriteFloat(msg, ent->v->velocity[i]);
        }
 
 // [always sent]       if (bits & SU_ITEMS)
@@ -1316,13 +1364,13 @@ void SV_WriteClientdataToMessage (edict_t *ent, sizebuf_t *msg)
 SV_SendClientDatagram
 =======================
 */
-static qbyte sv_sendclientdatagram_buf[MAX_DATAGRAM]; // FIXME?
+static qbyte sv_sendclientdatagram_buf[NET_MAXMESSAGE]; // FIXME?
 qboolean SV_SendClientDatagram (client_t *client)
 {
        sizebuf_t       msg;
 
        msg.data = sv_sendclientdatagram_buf;
-       msg.maxsize = sizeof(sv_sendclientdatagram_buf);
+       msg.maxsize = (int)bound(50.0, client->netconnection->rate * host_realframetime, (double)sizeof(sv_sendclientdatagram_buf));
        msg.cursize = 0;
 
        MSG_WriteByte (&msg, svc_time);
@@ -1334,7 +1382,8 @@ qboolean SV_SendClientDatagram (client_t *client)
        SV_WriteEntitiesToClient (client, client->edict, &msg);
 
        // copy the server datagram if there is space
-       if (msg.cursize + sv.datagram.cursize < msg.maxsize)
+       // FIXME: put in delayed queue of effects to send
+       if (msg.cursize + sv.datagram.cursize <= msg.maxsize)
                SZ_Write (&msg, sv.datagram.data, sv.datagram.cursize);
 
 // send the datagram
@@ -1757,7 +1806,11 @@ void SV_SpawnServer (const char *server)
        if (sv.active)
                SV_SendReconnect();
        else
+       {
+               // make sure cvars have been checked before opening the ports
+               NetConn_ServerFrame();
                NetConn_OpenServerPorts(true);
+       }
 
 //
 // make cvars consistant