Added a mempool parameter to FS_LoadFile

[xonotic/darkplaces.git] / sv_main.c

diff --git a/sv_main.c b/sv_main.c
index d695f3bf98557c47ae57a378686f4654b9a83203..4bd029285034556163168a49ce7ec4b6a1747ea7 100644 (file)
--- a/sv_main.c
+++ b/sv_main.c
@@ -79,7 +79,7 @@ static void SV_SaveEntFile_f(void)
        char basename[MAX_QPATH];
        if (!sv.active || !sv.worldmodel)
        {
-               Con_Printf("Not running a server\n");
+               Con_Print("Not running a server\n");
                return;
        }
        FS_StripExtension(sv.worldmodel->name, basename, sizeof(basename));
@@ -199,7 +199,7 @@ void SV_StartSound (edict_t *entity, int channel, char *sample, int volume, floa
 
        if ( sound_num == MAX_SOUNDS || !sv.sound_precache[sound_num] )
        {
-               Con_Printf ("SV_StartSound: %s not precached\n", sample);
+               Con_Printf("SV_StartSound: %s not precached\n", sample);
                return;
        }
 
@@ -272,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)
@@ -597,7 +597,7 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg)
 
                if (msg->maxsize - msg->cursize < 32) // LordHavoc: increased check from 16 to 32
                {
-                       Con_Printf ("packet overflow\n");
+                       Con_Print("packet overflow\n");
                        // mark the rest of the entities so they can't be delta compressed against this frame
                        for (;e < sv.num_edicts;e++)
                        {
@@ -816,7 +816,29 @@ void SV_PrepareEntitiesForSending(void)
                cs.lightstyle = (qbyte)GETEDICTFIELDVALUE(ent, eval_style)->_float;
                cs.lightpflags = (qbyte)GETEDICTFIELDVALUE(ent, eval_pflags)->_float;
 
-               cs.specialvisibilityradius = cs.light[3];
+               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)
@@ -1072,7 +1094,7 @@ void SV_WriteEntitiesToClient(client_t *client, edict_t *clent, sizebuf_t *msg)
                for (i = 0;i < MAX_ENTITY_HISTORY;i++)
                        if (d->commit[i].numentities)
                                Con_Printf(" %i", d->commit[i].framenum);
-               Con_Printf(")\n");
+               Con_Print(")\n");
        }
        if (d->currententitynumber >= sv.max_edicts)
                startnumber = 1;
@@ -1295,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)
@@ -1775,7 +1797,7 @@ void SV_SpawnServer (const char *server)
                Cvar_Set ("hostname", "UNNAMED");
        scr_centertime_off = 0;
 
-       Con_DPrintf ("SpawnServer: %s\n",server);
+       Con_DPrintf("SpawnServer: %s\n",server);
        svs.changelevel_issued = false;         // now safe to issue another
 
 //
@@ -1860,7 +1882,7 @@ void SV_SpawnServer (const char *server)
        sv.worldmodel = Mod_ForName(sv.modelname, false, true, true);
        if (!sv.worldmodel)
        {
-               Con_Printf ("Couldn't spawn server %s\n", sv.modelname);
+               Con_Printf("Couldn't spawn server %s\n", sv.modelname);
                sv.active = false;
                return;
        }
@@ -1905,7 +1927,7 @@ void SV_SpawnServer (const char *server)
        // load replacement entity file if found
        entities = NULL;
        if (sv_entpatch.integer)
-               entities = FS_LoadFile(va("maps/%s.ent", sv.name), true);
+               entities = FS_LoadFile(va("maps/%s.ent", sv.name), tempmempool, true);
        if (entities)
        {
                Con_Printf("Loaded maps/%s.ent\n", sv.name);
@@ -1943,7 +1965,7 @@ void SV_SpawnServer (const char *server)
                if (host_client->netconnection)
                        SV_SendServerinfo(host_client);
 
-       Con_DPrintf ("Server spawned.\n");
+       Con_DPrint("Server spawned.\n");
        NetConn_Heartbeat (2);
 }