]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - sv_main.c
remove an unused variable
[xonotic/darkplaces.git] / sv_main.c
index 0d51ed41db7203cb10e75e9a3466db33869081bc..9463489c32cfa152bfd134e0c1ffde4d064e1881 100644 (file)
--- a/sv_main.c
+++ b/sv_main.c
@@ -8,7 +8,7 @@ of the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 See the GNU General Public License for more details.
 
@@ -21,13 +21,49 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "quakedef.h"
 
-server_t               sv;
-server_static_t        svs;
+void SV_VM_Init();
+void SV_VM_Setup();
 
-char   localmodels[MAX_MODELS][5];                     // inline model names for precache
+void VM_AutoSentStats_Clear (void);
+void EntityFrameCSQC_ClearVersions (void);
+void EntityFrameCSQC_InitClientVersions (int client, qboolean clear);
+void VM_SV_WriteAutoSentStats (client_t *client, prvm_edict_t *ent, sizebuf_t *msg, int *stats);
+void EntityFrameCSQC_WriteFrame (sizebuf_t *msg, int numstates, const entity_state_t *states);
+
+
+// select which protocol to host, this is fed to Protocol_EnumForName
+cvar_t sv_protocolname = {0, "sv_protocolname", "DP7", "selects network protocol to host for (values include QUAKE, QUAKEDP, NEHAHRAMOVIE, DP1 and up)"};
+cvar_t sv_ratelimitlocalplayer = {0, "sv_ratelimitlocalplayer", "0", "whether to apply rate limiting to the local player in a listen server (only useful for testing)"};
+cvar_t sv_maxrate = {CVAR_SAVE | CVAR_NOTIFY, "sv_maxrate", "10000", "upper limit on client rate cvar, should reflect your network connection quality"};
+
+static cvar_t sv_cullentities_pvs = {0, "sv_cullentities_pvs", "1", "fast but loose culling of hidden entities"}; // fast but loose
+static cvar_t sv_cullentities_trace = {0, "sv_cullentities_trace", "0", "somewhat slow but very tight culling of hidden entities, minimizes network traffic and makes wallhack cheats useless"}; // tends to get false negatives, uses a timeout to keep entities visible a short time after becoming hidden
+static cvar_t sv_cullentities_stats = {0, "sv_cullentities_stats", "0", "displays stats on network entities culled by various methods for each client"};
+static cvar_t sv_entpatch = {0, "sv_entpatch", "1", "enables loading of .ent files to override entities in the bsp (for example Threewave CTF server pack contains .ent patch files enabling play of CTF on id1 maps)"};
+
+cvar_t sv_gameplayfix_grenadebouncedownslopes = {0, "sv_gameplayfix_grenadebouncedownslopes", "1", "prevents MOVETYPE_BOUNCE (grenades) from getting stuck when fired down a downward sloping surface"};
+cvar_t sv_gameplayfix_noairborncorpse = {0, "sv_gameplayfix_noairborncorpse", "1", "causes entities (corpses) sitting ontop of moving entities (players) to fall when the moving entity (player) is no longer supporting them"};
+cvar_t sv_gameplayfix_stepdown = {0, "sv_gameplayfix_stepdown", "0", "attempts to step down stairs, not just up them (prevents the familiar thud..thud..thud.. when running down stairs and slopes)"};
+cvar_t sv_gameplayfix_stepwhilejumping = {0, "sv_gameplayfix_stepwhilejumping", "1", "applies step-up onto a ledge even while airborn, useful if you would otherwise just-miss the floor when running across small areas with gaps (for instance running across the moving platforms in dm2, or jumping to the megahealth and red armor in dm2 rather than using the bridge)"};
+cvar_t sv_gameplayfix_swiminbmodels = {0, "sv_gameplayfix_swiminbmodels", "1", "causes pointcontents (used to determine if you are in a liquid) to check bmodel entities as well as the world model, so you can swim around in (possibly moving) water bmodel entities"};
+cvar_t sv_gameplayfix_setmodelrealbox = {0, "sv_gameplayfix_setmodelrealbox", "1", "fixes a bug in Quake that made setmodel always set the entity box to ('-16 -16 -16', '16 16 16') rather than properly checking the model box, breaks some poorly coded mods"};
+cvar_t sv_gameplayfix_blowupfallenzombies = {0, "sv_gameplayfix_blowupfallenzombies", "1", "causes findradius to detect SOLID_NOT entities such as zombies and corpses on the floor, allowing splash damage to apply to them"};
+cvar_t sv_gameplayfix_findradiusdistancetobox = {0, "sv_gameplayfix_findradiusdistancetobox", "1", "causes findradius to check the distance to the corner of a box rather than the center of the box, makes findradius detect bmodels such as very large doors that would otherwise be unaffected by splash damage"};
+cvar_t sv_gameplayfix_qwplayerphysics = {0, "sv_gameplayfix_qwplayerphysics", "1", "changes water jumping to make it easier to get out of water, and prevents friction on landing when bunnyhopping"};
+
+cvar_t sv_progs = {0, "sv_progs", "progs.dat", "selects which quakec progs.dat file to run" };
+
+server_t sv;
+server_static_t svs;
+
+mempool_t *sv_mempool = NULL;
 
 //============================================================================
 
+extern void SV_Phys_Init (void);
+extern void SV_World_Init (void);
+static void SV_SaveEntFile_f(void);
+
 /*
 ===============
 SV_Init
@@ -35,35 +71,59 @@ SV_Init
 */
 void SV_Init (void)
 {
-       int             i;
-       extern  cvar_t  sv_maxvelocity;
-       extern  cvar_t  sv_gravity;
-       extern  cvar_t  sv_nostep;
-       extern  cvar_t  sv_friction;
-       extern  cvar_t  sv_edgefriction;
-       extern  cvar_t  sv_stopspeed;
-       extern  cvar_t  sv_maxspeed;
-       extern  cvar_t  sv_accelerate;
-       extern  cvar_t  sv_idealpitchscale;
-       extern  cvar_t  sv_aim;
-       extern  cvar_t  sv_predict;
-
+       Cmd_AddCommand("sv_saveentfile", SV_SaveEntFile_f, "save map entities to .ent file (to allow external editing)");
        Cvar_RegisterVariable (&sv_maxvelocity);
        Cvar_RegisterVariable (&sv_gravity);
        Cvar_RegisterVariable (&sv_friction);
+       Cvar_RegisterVariable (&sv_waterfriction);
        Cvar_RegisterVariable (&sv_edgefriction);
        Cvar_RegisterVariable (&sv_stopspeed);
        Cvar_RegisterVariable (&sv_maxspeed);
+       Cvar_RegisterVariable (&sv_maxairspeed);
        Cvar_RegisterVariable (&sv_accelerate);
+       Cvar_RegisterVariable (&sv_airaccelerate);
+       Cvar_RegisterVariable (&sv_wateraccelerate);
        Cvar_RegisterVariable (&sv_idealpitchscale);
        Cvar_RegisterVariable (&sv_aim);
        Cvar_RegisterVariable (&sv_nostep);
-       Cvar_RegisterVariable (&sv_predict);
+       Cvar_RegisterVariable (&sv_cullentities_pvs);
+       Cvar_RegisterVariable (&sv_cullentities_trace);
+       Cvar_RegisterVariable (&sv_cullentities_stats);
+       Cvar_RegisterVariable (&sv_entpatch);
+       Cvar_RegisterVariable (&sv_gameplayfix_grenadebouncedownslopes);
+       Cvar_RegisterVariable (&sv_gameplayfix_noairborncorpse);
+       Cvar_RegisterVariable (&sv_gameplayfix_stepdown);
+       Cvar_RegisterVariable (&sv_gameplayfix_stepwhilejumping);
+       Cvar_RegisterVariable (&sv_gameplayfix_swiminbmodels);
+       Cvar_RegisterVariable (&sv_gameplayfix_setmodelrealbox);
+       Cvar_RegisterVariable (&sv_gameplayfix_blowupfallenzombies);
+       Cvar_RegisterVariable (&sv_gameplayfix_findradiusdistancetobox);
+       Cvar_RegisterVariable (&sv_gameplayfix_qwplayerphysics);
+       Cvar_RegisterVariable (&sv_protocolname);
+       Cvar_RegisterVariable (&sv_ratelimitlocalplayer);
+       Cvar_RegisterVariable (&sv_maxrate);
+       Cvar_RegisterVariable (&sv_progs);
+
+       SV_VM_Init();
+       SV_Phys_Init();
+       SV_World_Init();
+
+       sv_mempool = Mem_AllocPool("server", 0, NULL);
+}
 
-       for (i=0 ; i<MAX_MODELS ; i++)
-               sprintf (localmodels[i], "*%i", i);
+static void SV_SaveEntFile_f(void)
+{
+       char basename[MAX_QPATH];
+       if (!sv.active || !sv.worldmodel)
+       {
+               Con_Print("Not running a server\n");
+               return;
+       }
+       FS_StripExtension(sv.worldmodel->name, basename, sizeof(basename));
+       FS_WriteFile(va("%s.ent", basename), sv.worldmodel->brush.entities, (fs_offset_t)strlen(sv.worldmodel->brush.entities));
 }
 
+
 /*
 =============================================================================
 
@@ -72,7 +132,7 @@ EVENT MESSAGES
 =============================================================================
 */
 
-/*  
+/*
 ==================
 SV_StartParticle
 
@@ -81,28 +141,58 @@ Make sure the event gets sent to all clients
 */
 void SV_StartParticle (vec3_t org, vec3_t dir, int color, int count)
 {
-       int             i, v;
+       int i;
 
-       if (sv.datagram.cursize > MAX_DATAGRAM-16)
-               return; 
+       if (sv.datagram.cursize > MAX_PACKETFRAGMENT-18)
+               return;
        MSG_WriteByte (&sv.datagram, svc_particle);
-       MSG_WriteFloatCoord (&sv.datagram, org[0]);
-       MSG_WriteFloatCoord (&sv.datagram, org[1]);
-       MSG_WriteFloatCoord (&sv.datagram, org[2]);
+       MSG_WriteCoord (&sv.datagram, org[0], sv.protocol);
+       MSG_WriteCoord (&sv.datagram, org[1], sv.protocol);
+       MSG_WriteCoord (&sv.datagram, org[2], sv.protocol);
        for (i=0 ; i<3 ; i++)
-       {
-               v = dir[i]*16;
-               if (v > 127)
-                       v = 127;
-               else if (v < -128)
-                       v = -128;
-               MSG_WriteChar (&sv.datagram, v);
-       }
+               MSG_WriteChar (&sv.datagram, (int)bound(-128, dir[i]*16, 127));
        MSG_WriteByte (&sv.datagram, count);
        MSG_WriteByte (&sv.datagram, color);
-}           
+}
+
+/*
+==================
+SV_StartEffect
 
-/*  
+Make sure the event gets sent to all clients
+==================
+*/
+void SV_StartEffect (vec3_t org, int modelindex, int startframe, int framecount, int framerate)
+{
+       if (modelindex >= 256 || startframe >= 256)
+       {
+               if (sv.datagram.cursize > MAX_PACKETFRAGMENT-19)
+                       return;
+               MSG_WriteByte (&sv.datagram, svc_effect2);
+               MSG_WriteCoord (&sv.datagram, org[0], sv.protocol);
+               MSG_WriteCoord (&sv.datagram, org[1], sv.protocol);
+               MSG_WriteCoord (&sv.datagram, org[2], sv.protocol);
+               MSG_WriteShort (&sv.datagram, modelindex);
+               MSG_WriteShort (&sv.datagram, startframe);
+               MSG_WriteByte (&sv.datagram, framecount);
+               MSG_WriteByte (&sv.datagram, framerate);
+       }
+       else
+       {
+               if (sv.datagram.cursize > MAX_PACKETFRAGMENT-17)
+                       return;
+               MSG_WriteByte (&sv.datagram, svc_effect);
+               MSG_WriteCoord (&sv.datagram, org[0], sv.protocol);
+               MSG_WriteCoord (&sv.datagram, org[1], sv.protocol);
+               MSG_WriteCoord (&sv.datagram, org[2], sv.protocol);
+               MSG_WriteByte (&sv.datagram, modelindex);
+               MSG_WriteByte (&sv.datagram, startframe);
+               MSG_WriteByte (&sv.datagram, framecount);
+               MSG_WriteByte (&sv.datagram, framerate);
+       }
+}
+
+/*
 ==================
 SV_StartSound
 
@@ -110,67 +200,76 @@ Each entity can have eight independant sound sources, like voice,
 weapon, feet, etc.
 
 Channel 0 is an auto-allocate channel, the others override anything
-allready running on that entity/channel pair.
+already running on that entity/channel pair.
 
 An attenuation of 0 will play full volume everywhere in the level.
 Larger attenuations will drop off.  (max 4 attenuation)
 
 ==================
-*/  
-void SV_StartSound (edict_t *entity, int channel, char *sample, int volume,
-    float attenuation)
-{       
-    int         sound_num;
-    int field_mask;
-    int                        i;
-       int                     ent;
-       
+*/
+void SV_StartSound (prvm_edict_t *entity, int channel, const char *sample, int volume, float attenuation)
+{
+       int sound_num, field_mask, i, ent;
+
        if (volume < 0 || volume > 255)
-               Host_Error ("SV_StartSound: volume = %i", volume);
+       {
+               Con_Printf ("SV_StartSound: volume = %i\n", volume);
+               return;
+       }
 
        if (attenuation < 0 || attenuation > 4)
-               Host_Error ("SV_StartSound: attenuation = %f", attenuation);
+       {
+               Con_Printf ("SV_StartSound: attenuation = %f\n", attenuation);
+               return;
+       }
 
        if (channel < 0 || channel > 7)
-               Host_Error ("SV_StartSound: channel = %i", channel);
+       {
+               Con_Printf ("SV_StartSound: channel = %i\n", channel);
+               return;
+       }
 
-       if (sv.datagram.cursize > MAX_DATAGRAM-16)
-               return; 
+       if (sv.datagram.cursize > MAX_PACKETFRAGMENT-21)
+               return;
 
 // find precache number for sound
-    for (sound_num=1 ; sound_num<MAX_SOUNDS
-        && sv.sound_precache[sound_num] ; sound_num++)
-        if (!strcmp(sample, sv.sound_precache[sound_num]))
-            break;
-    
-    if ( sound_num == MAX_SOUNDS || !sv.sound_precache[sound_num] )
-    {
-        Con_Printf ("SV_StartSound: %s not precached\n", sample);
-        return;
-    }
-    
-       ent = NUM_FOR_EDICT(entity);
-
-       channel = (ent<<3) | channel;
+       sound_num = SV_SoundIndex(sample, 1);
+       if (!sound_num)
+               return;
+
+       ent = PRVM_NUM_FOR_EDICT(entity);
 
        field_mask = 0;
        if (volume != DEFAULT_SOUND_PACKET_VOLUME)
                field_mask |= SND_VOLUME;
        if (attenuation != DEFAULT_SOUND_PACKET_ATTENUATION)
                field_mask |= SND_ATTENUATION;
+       if (ent >= 8192)
+               field_mask |= SND_LARGEENTITY;
+       if (sound_num >= 256 || channel >= 8)
+               field_mask |= SND_LARGESOUND;
 
-// directed messages go only to the entity the are targeted on
+// directed messages go only to the entity they are targeted on
        MSG_WriteByte (&sv.datagram, svc_sound);
        MSG_WriteByte (&sv.datagram, field_mask);
        if (field_mask & SND_VOLUME)
                MSG_WriteByte (&sv.datagram, volume);
        if (field_mask & SND_ATTENUATION)
-               MSG_WriteByte (&sv.datagram, attenuation*64);
-       MSG_WriteShort (&sv.datagram, channel);
-       MSG_WriteByte (&sv.datagram, sound_num);
-       for (i=0 ; i<3 ; i++)
-               MSG_WriteFloatCoord (&sv.datagram, entity->v.origin[i]+0.5*(entity->v.mins[i]+entity->v.maxs[i]));
-}           
+               MSG_WriteByte (&sv.datagram, (int)(attenuation*64));
+       if (field_mask & SND_LARGEENTITY)
+       {
+               MSG_WriteShort (&sv.datagram, ent);
+               MSG_WriteByte (&sv.datagram, channel);
+       }
+       else
+               MSG_WriteShort (&sv.datagram, (ent<<3) | channel);
+       if (field_mask & SND_LARGESOUND)
+               MSG_WriteShort (&sv.datagram, sound_num);
+       else
+               MSG_WriteByte (&sv.datagram, sound_num);
+       for (i = 0;i < 3;i++)
+               MSG_WriteCoord (&sv.datagram, entity->fields.server->origin[i]+0.5*(entity->fields.server->mins[i]+entity->fields.server->maxs[i]), sv.protocol);
+}
 
 /*
 ==============================================================================
@@ -180,6 +279,8 @@ CLIENT SPAWNING
 ==============================================================================
 */
 
+static const char *SV_InitCmd; //[515]: svprogs able to send cmd to client on connect
+extern qboolean csqc_loaded;
 /*
 ================
 SV_SendServerinfo
@@ -190,47 +291,85 @@ This will be sent on the initial connection and upon each server load.
 */
 void SV_SendServerinfo (client_t *client)
 {
-       char                    **s;
-       char                    message[2048];
+       int i;
+       char message[128];
 
-       MSG_WriteByte (&client->message, svc_print);
-       sprintf (message, "%c\nDARKPLACES VERSION %4.2f BUILD %i SERVER (%i CRC)", 2, VERSION, buildnumber, pr_crc);
-       MSG_WriteString (&client->message,message);
+       // we know that this client has a netconnection and thus is not a bot
 
-       MSG_WriteByte (&client->message, svc_serverinfo);
-       MSG_WriteLong (&client->message, DPPROTOCOL_VERSION);
-       MSG_WriteByte (&client->message, svs.maxclients);
+       // edicts get reallocated on level changes, so we need to update it here
+       client->edict = PRVM_EDICT_NUM((client - svs.clients) + 1);
 
-       if (!coop.value && deathmatch.value)
-               MSG_WriteByte (&client->message, GAME_DEATHMATCH);
-       else
-               MSG_WriteByte (&client->message, GAME_COOP);
+       // clear cached stuff that depends on the level
+       client->weaponmodel[0] = 0;
+       client->weaponmodelindex = 0;
 
-       sprintf (message, pr_strings+sv.edicts->v.message);
+       // LordHavoc: clear entityframe tracking
+       client->latestframenum = 0;
 
-       MSG_WriteString (&client->message,message);
+       if (client->entitydatabase)
+               EntityFrame_FreeDatabase(client->entitydatabase);
+       if (client->entitydatabase4)
+               EntityFrame4_FreeDatabase(client->entitydatabase4);
+       if (client->entitydatabase5)
+               EntityFrame5_FreeDatabase(client->entitydatabase5);
 
-       for (s = sv.model_precache+1 ; *s ; s++)
-               MSG_WriteString (&client->message, *s);
-       MSG_WriteByte (&client->message, 0);
+       if (sv.protocol != PROTOCOL_QUAKE && sv.protocol != PROTOCOL_QUAKEDP && sv.protocol != PROTOCOL_NEHAHRAMOVIE)
+       {
+               if (sv.protocol == PROTOCOL_DARKPLACES1 || sv.protocol == PROTOCOL_DARKPLACES2 || sv.protocol == PROTOCOL_DARKPLACES3)
+                       client->entitydatabase = EntityFrame_AllocDatabase(sv_mempool);
+               else if (sv.protocol == PROTOCOL_DARKPLACES4)
+                       client->entitydatabase4 = EntityFrame4_AllocDatabase(sv_mempool);
+               else
+                       client->entitydatabase5 = EntityFrame5_AllocDatabase(sv_mempool);
+       }
 
-       for (s = sv.sound_precache+1 ; *s ; s++)
-               MSG_WriteString (&client->message, *s);
-       MSG_WriteByte (&client->message, 0);
+       SZ_Clear (&client->netconnection->message);
+       MSG_WriteByte (&client->netconnection->message, svc_print);
+       dpsnprintf (message, sizeof (message), "\nServer: %s build %s (progs %i crc)", gamename, buildstring, prog->filecrc);
+       MSG_WriteString (&client->netconnection->message,message);
+
+       // FIXME: LordHavoc: this does not work on dedicated servers, needs fixing.
+//[515]: init csprogs according to version of svprogs, check the crc, etc.
+       if(csqc_loaded && (cls.state == ca_dedicated || PRVM_NUM_FOR_EDICT(client->edict) != 1))
+       {
+               MSG_WriteByte (&client->netconnection->message, svc_stufftext);
+               if(SV_InitCmd)
+                       MSG_WriteString (&client->netconnection->message, va("csqc_progcrc %i;%s\n", csqc_progcrc.integer, SV_InitCmd));
+               else
+                       MSG_WriteString (&client->netconnection->message, va("csqc_progcrc %i\n", csqc_progcrc.integer));
+       }
+
+       MSG_WriteByte (&client->netconnection->message, svc_serverinfo);
+       MSG_WriteLong (&client->netconnection->message, Protocol_NumberForEnum(sv.protocol));
+       MSG_WriteByte (&client->netconnection->message, svs.maxclients);
+
+       if (!coop.integer && deathmatch.integer)
+               MSG_WriteByte (&client->netconnection->message, GAME_DEATHMATCH);
+       else
+               MSG_WriteByte (&client->netconnection->message, GAME_COOP);
+
+       MSG_WriteString (&client->netconnection->message,PRVM_GetString(prog->edicts->fields.server->message));
+
+       for (i = 1;i < MAX_MODELS && sv.model_precache[i][0];i++)
+               MSG_WriteString (&client->netconnection->message, sv.model_precache[i]);
+       MSG_WriteByte (&client->netconnection->message, 0);
+
+       for (i = 1;i < MAX_SOUNDS && sv.sound_precache[i][0];i++)
+               MSG_WriteString (&client->netconnection->message, sv.sound_precache[i]);
+       MSG_WriteByte (&client->netconnection->message, 0);
 
 // send music
-       MSG_WriteByte (&client->message, svc_cdtrack);
-       MSG_WriteByte (&client->message, sv.edicts->v.sounds);
-       MSG_WriteByte (&client->message, sv.edicts->v.sounds);
+       MSG_WriteByte (&client->netconnection->message, svc_cdtrack);
+       MSG_WriteByte (&client->netconnection->message, (int)prog->edicts->fields.server->sounds);
+       MSG_WriteByte (&client->netconnection->message, (int)prog->edicts->fields.server->sounds);
 
-// set view    
-       MSG_WriteByte (&client->message, svc_setview);
-       MSG_WriteShort (&client->message, NUM_FOR_EDICT(client->edict));
+// set view
+       MSG_WriteByte (&client->netconnection->message, svc_setview);
+       MSG_WriteShort (&client->netconnection->message, PRVM_NUM_FOR_EDICT(client->edict));
 
-       MSG_WriteByte (&client->message, svc_signonnum);
-       MSG_WriteByte (&client->message, 1);
+       MSG_WriteByte (&client->netconnection->message, svc_signonnum);
+       MSG_WriteByte (&client->netconnection->message, 1);
 
-       client->sendsignon = true;
        client->spawned = false;                // need prespawn, spawn, etc
 }
 
@@ -242,89 +381,61 @@ Initializes a client_t for a new net connection.  This will only be called
 once for a player each game, not once for each level change.
 ================
 */
-void SV_ConnectClient (int clientnum)
+void SV_ConnectClient (int clientnum, netconn_t *netconnection)
 {
-       edict_t                 *ent;
        client_t                *client;
-       int                             edictnum;
-       struct qsocket_s *netconnection;
        int                             i;
        float                   spawn_parms[NUM_SPAWN_PARMS];
 
        client = svs.clients + clientnum;
 
-       Con_DPrintf ("Client %s connected\n", client->netconnection->address);
+       if(netconnection)//[515]: bots don't play with csqc =)
+               EntityFrameCSQC_InitClientVersions(clientnum, false);
 
-       edictnum = clientnum+1;
-
-       ent = EDICT_NUM(edictnum);
-       
 // set up the client_t
-       netconnection = client->netconnection;
-       
        if (sv.loadgame)
                memcpy (spawn_parms, client->spawn_parms, sizeof(spawn_parms));
        memset (client, 0, sizeof(*client));
+       client->active = true;
        client->netconnection = netconnection;
 
-       strcpy (client->name, "unconnected");
-       client->active = true;
+       Con_DPrintf("Client %s connected\n", client->netconnection ? client->netconnection->address : "botclient");
+
+       strcpy(client->name, "unconnected");
+       strcpy(client->old_name, "unconnected");
        client->spawned = false;
-       client->edict = ent;
-       client->message.data = client->msgbuf;
-       client->message.maxsize = sizeof(client->msgbuf);
-       client->message.allowoverflow = true;           // we can catch it
+       client->edict = PRVM_EDICT_NUM(clientnum+1);
+       if (client->netconnection)
+               client->netconnection->message.allowoverflow = true;            // we can catch it
+       // updated by receiving "rate" command from client
+       client->rate = NET_MINRATE;
+       // no limits for local player
+       if (client->netconnection && LHNETADDRESS_GetAddressType(&client->netconnection->peeraddress) == LHNETADDRESSTYPE_LOOP)
+               client->rate = 1000000000;
+       client->connecttime = realtime;
 
        if (sv.loadgame)
                memcpy (client->spawn_parms, spawn_parms, sizeof(spawn_parms));
        else
        {
-       // call the progs to get default spawn parms for the new client
-               PR_ExecuteProgram (pr_global_struct->SetNewParms, "QC function SetNewParms is missing");
+               // call the progs to get default spawn parms for the new client
+               // set self to world to intentionally cause errors with broken SetNewParms code in some mods
+               prog->globals.server->self = 0;
+               PRVM_ExecuteProgram (prog->globals.server->SetNewParms, "QC function SetNewParms is missing");
                for (i=0 ; i<NUM_SPAWN_PARMS ; i++)
-                       client->spawn_parms[i] = (&pr_global_struct->parm1)[i];
-       }
+                       client->spawn_parms[i] = (&prog->globals.server->parm1)[i];
 
-       SV_SendServerinfo (client);
-}
-
-
-/*
-===================
-SV_CheckForNewClients
-
-===================
-*/
-void SV_CheckForNewClients (void)
-{
-       struct qsocket_s        *ret;
-       int                             i;
-               
-//
-// check for new connections
-//
-       while (1)
-       {
-               ret = NET_CheckNewConnections ();
-               if (!ret)
-                       break;
-
-       // 
-       // init a new client structure
-       //      
-               for (i=0 ; i<svs.maxclients ; i++)
-                       if (!svs.clients[i].active)
-                               break;
-               if (i == svs.maxclients)
-                       Sys_Error ("Host_CheckForNewClients: no free clients");
-               
-               svs.clients[i].netconnection = ret;
-               SV_ConnectClient (i);   
-       
-               net_activeconnections++;
+               // set up the entity for this client (including .colormap, .team, etc)
+               PRVM_ED_ClearEdict(client->edict);
        }
-}
 
+       // don't call SendServerinfo for a fresh botclient because its fields have
+       // not been set up by the qc yet
+       if (client->netconnection)
+               SV_SendServerinfo (client);
+       else
+               client->spawned = true;
+}
 
 
 /*
@@ -357,347 +468,466 @@ crosses a waterline.
 =============================================================================
 */
 
-int            fatbytes;
-byte   fatpvs[MAX_MAP_LEAFS/8];
+int sv_writeentitiestoclient_pvsbytes;
+unsigned char sv_writeentitiestoclient_pvs[MAX_MAP_LEAFS/8];
 
-void SV_AddToFatPVS (vec3_t org, mnode_t *node)
-{
-       int             i;
-       byte    *pvs;
-       mplane_t        *plane;
-       float   d;
+static int numsendentities;
+static entity_state_t sendentities[MAX_EDICTS];
+static entity_state_t *sendentitiesindex[MAX_EDICTS];
 
-       while (1)
+qboolean SV_PrepareEntityForSending (prvm_edict_t *ent, entity_state_t *cs, int e)
+{
+       int i;
+       unsigned int modelindex, effects, flags, glowsize, lightstyle, lightpflags, light[4], specialvisibilityradius;
+       unsigned int customizeentityforclient;
+       float f;
+       vec3_t cullmins, cullmaxs;
+       model_t *model;
+       prvm_eval_t *val;
+
+       // EF_NODRAW prevents sending for any reason except for your own
+       // client, so we must keep all clients in this superset
+       effects = (unsigned)ent->fields.server->effects;
+
+       // we can omit invisible entities with no effects that are not clients
+       // LordHavoc: this could kill tags attached to an invisible entity, I
+       // just hope we never have to support that case
+       i = (int)ent->fields.server->modelindex;
+       modelindex = (i >= 1 && i < MAX_MODELS && *PRVM_GetString(ent->fields.server->model)) ? i : 0;
+
+       flags = 0;
+       i = (int)(PRVM_GETEDICTFIELDVALUE(ent, eval_glow_size)->_float * 0.25f);
+       glowsize = (unsigned char)bound(0, i, 255);
+       if (PRVM_GETEDICTFIELDVALUE(ent, eval_glow_trail)->_float)
+               flags |= RENDER_GLOWTRAIL;
+
+       f = PRVM_GETEDICTFIELDVALUE(ent, eval_color)->vector[0]*256;
+       light[0] = (unsigned short)bound(0, f, 65535);
+       f = PRVM_GETEDICTFIELDVALUE(ent, eval_color)->vector[1]*256;
+       light[1] = (unsigned short)bound(0, f, 65535);
+       f = PRVM_GETEDICTFIELDVALUE(ent, eval_color)->vector[2]*256;
+       light[2] = (unsigned short)bound(0, f, 65535);
+       f = PRVM_GETEDICTFIELDVALUE(ent, eval_light_lev)->_float;
+       light[3] = (unsigned short)bound(0, f, 65535);
+       lightstyle = (unsigned char)PRVM_GETEDICTFIELDVALUE(ent, eval_style)->_float;
+       lightpflags = (unsigned char)PRVM_GETEDICTFIELDVALUE(ent, eval_pflags)->_float;
+
+       if (gamemode == GAME_TENEBRAE)
        {
-       // if this is a leaf, accumulate the pvs bits
-               if (node->contents < 0)
+               // tenebrae's EF_FULLDYNAMIC conflicts with Q2's EF_NODRAW
+               if (effects & 16)
                {
-                       if (node->contents != CONTENTS_SOLID)
-                       {
-                               pvs = Mod_LeafPVS ( (mleaf_t *)node, sv.worldmodel);
-                               for (i=0 ; i<fatbytes ; i++)
-                                       fatpvs[i] |= pvs[i];
-                       }
-                       return;
+                       effects &= ~16;
+                       lightpflags |= PFLAGS_FULLDYNAMIC;
                }
-       
-               plane = node->plane;
-               d = DotProduct (org, plane->normal) - plane->dist;
-               if (d > 8)
-                       node = node->children[0];
-               else if (d < -8)
-                       node = node->children[1];
-               else
-               {       // go down both
-                       SV_AddToFatPVS (org, node->children[0]);
-                       node = node->children[1];
+               // tenebrae's EF_GREEN conflicts with DP's EF_ADDITIVE
+               if (effects & 32)
+               {
+                       effects &= ~32;
+                       light[0] = (int)(0.2*256);
+                       light[1] = (int)(1.0*256);
+                       light[2] = (int)(0.2*256);
+                       light[3] = 200;
+                       lightpflags |= PFLAGS_FULLDYNAMIC;
                }
        }
-}
 
-/*
-=============
-SV_FatPVS
+       specialvisibilityradius = 0;
+       if (lightpflags & PFLAGS_FULLDYNAMIC)
+               specialvisibilityradius = max(specialvisibilityradius, light[3]);
+       if (glowsize)
+               specialvisibilityradius = max(specialvisibilityradius, glowsize * 4);
+       if (flags & RENDER_GLOWTRAIL)
+               specialvisibilityradius = max(specialvisibilityradius, 100);
+       if (effects & (EF_BRIGHTFIELD | EF_MUZZLEFLASH | EF_BRIGHTLIGHT | EF_DIMLIGHT | EF_RED | EF_BLUE | EF_FLAME | EF_STARDUST))
+       {
+               if (effects & EF_BRIGHTFIELD)
+                       specialvisibilityradius = max(specialvisibilityradius, 80);
+               if (effects & EF_MUZZLEFLASH)
+                       specialvisibilityradius = max(specialvisibilityradius, 100);
+               if (effects & EF_BRIGHTLIGHT)
+                       specialvisibilityradius = max(specialvisibilityradius, 400);
+               if (effects & EF_DIMLIGHT)
+                       specialvisibilityradius = max(specialvisibilityradius, 200);
+               if (effects & EF_RED)
+                       specialvisibilityradius = max(specialvisibilityradius, 200);
+               if (effects & EF_BLUE)
+                       specialvisibilityradius = max(specialvisibilityradius, 200);
+               if (effects & EF_FLAME)
+                       specialvisibilityradius = max(specialvisibilityradius, 250);
+               if (effects & EF_STARDUST)
+                       specialvisibilityradius = max(specialvisibilityradius, 100);
+       }
 
-Calculates a PVS that is the inclusive or of all leafs within 8 pixels of the
-given point.
-=============
-*/
-byte *SV_FatPVS (vec3_t org)
-{
-       fatbytes = (sv.worldmodel->numleafs+31)>>3;
-       memset (fatpvs, 0, fatbytes);
-       SV_AddToFatPVS (org, sv.worldmodel->nodes);
-       return fatpvs;
-}
+       // early culling checks
+       // (final culling is done by SV_MarkWriteEntityStateToClient)
+       customizeentityforclient = PRVM_GETEDICTFIELDVALUE(ent, eval_customizeentityforclient)->function;
+       if (!customizeentityforclient)
+       {
+               if (e > svs.maxclients && (!modelindex && !specialvisibilityradius))
+                       return false;
+               // this 2 billion unit check is actually to detect NAN origins
+               // (we really don't want to send those)
+               if (VectorLength2(ent->fields.server->origin) > 2000000000.0*2000000000.0)
+                       return false;
+       }
 
-//=============================================================================
 
+       *cs = defaultstate;
+       cs->active = true;
+       cs->number = e;
+       VectorCopy(ent->fields.server->origin, cs->origin);
+       VectorCopy(ent->fields.server->angles, cs->angles);
+       cs->flags = flags;
+       cs->effects = effects;
+       cs->colormap = (unsigned)ent->fields.server->colormap;
+       cs->modelindex = modelindex;
+       cs->skin = (unsigned)ent->fields.server->skin;
+       cs->frame = (unsigned)ent->fields.server->frame;
+       cs->viewmodelforclient = PRVM_GETEDICTFIELDVALUE(ent, eval_viewmodelforclient)->edict;
+       cs->exteriormodelforclient = PRVM_GETEDICTFIELDVALUE(ent, eval_exteriormodeltoclient)->edict;
+       cs->nodrawtoclient = PRVM_GETEDICTFIELDVALUE(ent, eval_nodrawtoclient)->edict;
+       cs->drawonlytoclient = PRVM_GETEDICTFIELDVALUE(ent, eval_drawonlytoclient)->edict;
+       cs->customizeentityforclient = customizeentityforclient;
+       cs->tagentity = PRVM_GETEDICTFIELDVALUE(ent, eval_tag_entity)->edict;
+       cs->tagindex = (unsigned char)PRVM_GETEDICTFIELDVALUE(ent, eval_tag_index)->_float;
+       cs->glowsize = glowsize;
+
+       // don't need to init cs->colormod because the defaultstate did that for us
+       //cs->colormod[0] = cs->colormod[1] = cs->colormod[2] = 32;
+       val = PRVM_GETEDICTFIELDVALUE(ent, eval_colormod);
+       if (val->vector[0] || val->vector[1] || val->vector[2])
+       {
+               i = (int)(val->vector[0] * 32.0f);cs->colormod[0] = bound(0, i, 255);
+               i = (int)(val->vector[1] * 32.0f);cs->colormod[1] = bound(0, i, 255);
+               i = (int)(val->vector[2] * 32.0f);cs->colormod[2] = bound(0, i, 255);
+       }
 
-/*
-=============
-SV_WriteEntitiesToClient
+       cs->modelindex = modelindex;
 
-=============
-*/
-void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg)
-{
-       int             e, i, clentnum, bits, alpha, glowcolor, glowsize, scale, colormod, modred, modgreen, modblue, dodelta, effects;
-       byte    *pvs;
-       vec3_t  org, origin, angles;
-       float   movelerp, moveilerp;
-       edict_t *ent;
-       eval_t  *val;
-       entity_state_t *baseline; // LordHavoc: delta or startup baseline
+       cs->alpha = 255;
+       f = (PRVM_GETEDICTFIELDVALUE(ent, eval_alpha)->_float * 255.0f);
+       if (f)
+       {
+               i = (int)f;
+               cs->alpha = (unsigned char)bound(0, i, 255);
+       }
+       // halflife
+       f = (PRVM_GETEDICTFIELDVALUE(ent, eval_renderamt)->_float);
+       if (f)
+       {
+               i = (int)f;
+               cs->alpha = (unsigned char)bound(0, i, 255);
+       }
 
-// find the client's PVS
-       VectorAdd (clent->v.origin, clent->v.view_ofs, org);
-       pvs = SV_FatPVS (org);
-       /*
-       if (dpprotocol)
+       cs->scale = 16;
+       f = (PRVM_GETEDICTFIELDVALUE(ent, eval_scale)->_float * 16.0f);
+       if (f)
        {
-               MSG_WriteByte(msg, svc_playerposition);
-               MSG_WriteFloat(msg, org[0]);
-               MSG_WriteFloat(msg, org[1]);
-               MSG_WriteFloat(msg, org[2]);
+               i = (int)f;
+               cs->scale = (unsigned char)bound(0, i, 255);
        }
-       */
 
-       clentnum = EDICT_TO_PROG(clent); // LordHavoc: for comparison purposes
-// send over all entities (except the client) that touch the pvs
-       ent = NEXT_EDICT(sv.edicts);
-       for (e=1 ; e<sv.num_edicts ; e++, ent = NEXT_EDICT(ent))
+       cs->glowcolor = 254;
+       f = (PRVM_GETEDICTFIELDVALUE(ent, eval_glow_color)->_float);
+       if (f)
+               cs->glowcolor = (int)f;
+
+       if (PRVM_GETEDICTFIELDVALUE(ent, eval_fullbright)->_float)
+               cs->effects |= EF_FULLBRIGHT;
+
+       if (ent->fields.server->movetype == MOVETYPE_STEP)
+               cs->flags |= RENDER_STEP;
+       if ((cs->effects & EF_LOWPRECISION) && cs->origin[0] >= -32768 && cs->origin[1] >= -32768 && cs->origin[2] >= -32768 && cs->origin[0] <= 32767 && cs->origin[1] <= 32767 && cs->origin[2] <= 32767)
+               cs->flags |= RENDER_LOWPRECISION;
+       if (ent->fields.server->colormap >= 1024)
+               cs->flags |= RENDER_COLORMAPPED;
+       if (cs->viewmodelforclient)
+               cs->flags |= RENDER_VIEWMODEL; // show relative to the view
+
+       cs->light[0] = light[0];
+       cs->light[1] = light[1];
+       cs->light[2] = light[2];
+       cs->light[3] = light[3];
+       cs->lightstyle = lightstyle;
+       cs->lightpflags = lightpflags;
+
+       cs->specialvisibilityradius = specialvisibilityradius;
+
+       // calculate the visible box of this entity (don't use the physics box
+       // as that is often smaller than a model, and would not count
+       // specialvisibilityradius)
+       if ((model = sv.models[modelindex]))
        {
-               bits = 0;
-               if (ent != clent) // LordHavoc: always send player
+               float scale = cs->scale * (1.0f / 16.0f);
+               if (cs->angles[0] || cs->angles[2]) // pitch and roll
                {
-                       if ((val = GETEDICTFIELDVALUE(ent, eval_viewmodelforclient)) && val->edict)
-                       {
-                               if (val->edict != clentnum)
-                                       continue; // don't show to anyone else
-                               else
-                                       bits |= U_VIEWMODEL; // show relative to the view
-                       }
-                       else
-                       {
-                               // LordHavoc: never draw something told not to display to this client
-                               if ((val = GETEDICTFIELDVALUE(ent, eval_nodrawtoclient)) && val->edict == clentnum)
-                                       continue;
-                               if ((val = GETEDICTFIELDVALUE(ent, eval_drawonlytoclient)) && val->edict && val->edict != clentnum)
-                                       continue;
-                               // ignore if not touching a PV leaf
-                               for (i=0 ; i < ent->num_leafs ; i++)
-                                       if (pvs[ent->leafnums[i] >> 3] & (1 << (ent->leafnums[i]&7) ))
-                                               break;
-                                       
-                               if (i == ent->num_leafs)
-                                       continue;               // not visible
-                       }
+                       VectorMA(cs->origin, scale, model->rotatedmins, cullmins);
+                       VectorMA(cs->origin, scale, model->rotatedmaxs, cullmaxs);
                }
-
-               // don't send if flagged for NODRAW and there are no effects
-               alpha = 255;
-               scale = 16;
-               glowsize = 0;
-               glowcolor = 254;
-               colormod = 255;
-               effects = ent->v.effects;
-
-               if ((val = GETEDICTFIELDVALUE(ent, eval_alpha)))
-               if ((alpha = (int) (val->_float * 255.0)) == 0)
-                       alpha = 255;
-               if ((val = GETEDICTFIELDVALUE(ent, eval_renderamt)) && val->_float != 0) // HalfLife support
-                       alpha = (int) val->_float;
-               if (alpha < 0) alpha = 0;
-               if (alpha > 255) alpha = 255;
-
-               if ((val = GETEDICTFIELDVALUE(ent, eval_glow_size)))
-                       glowsize = (int) val->_float >> 2;
-               if (glowsize > 255) glowsize = 255;
-               if (glowsize < 0) glowsize = 0;
-
-               if ((val = GETEDICTFIELDVALUE(ent, eval_scale)))
-               if ((scale = (int) (val->_float * 16.0)) == 0) scale = 16;
-               if (scale < 0) scale = 0;
-               if (scale > 255) scale = 255;
-
-               if ((val = GETEDICTFIELDVALUE(ent, eval_glow_trail)))
-               if (val->_float != 0)
-                       bits |= U_GLOWTRAIL;
-
-               if ((val = GETEDICTFIELDVALUE(ent, eval_glow_color)))
-               if (val->_float != 0)
-                       glowcolor = (int) val->_float;
-
-               if ((val = GETEDICTFIELDVALUE(ent, eval_fullbright)))
-               if (val->_float != 0)
-                       effects |= EF_FULLBRIGHT;
-
-               if ((val = GETEDICTFIELDVALUE(ent, eval_colormod)))
-               if (val->vector[0] != 0 || val->vector[1] != 0 || val->vector[2] != 0)
+               else if (cs->angles[1])
                {
-                       modred = val->vector[0] * 8.0;if (modred < 0) modred = 0;if (modred > 7) modred = 7;
-                       modgreen = val->vector[1] * 8.0;if (modgreen < 0) modgreen = 0;if (modgreen > 7) modgreen = 7;
-                       modblue = val->vector[2] * 4.0;if (modblue < 0) modblue = 0;if (modblue > 3) modblue = 3;
-                       colormod = (modred << 5) | (modgreen << 2) | modblue;
+                       VectorMA(cs->origin, scale, model->yawmins, cullmins);
+                       VectorMA(cs->origin, scale, model->yawmaxs, cullmaxs);
                }
-
-               if (ent != clent)
+               else
                {
-                       if (glowsize == 0 && bits == 0) // no effects
-                       {
-                               if (ent->v.modelindex && pr_strings[ent->v.model]) // model
-                               {
-                                       if (sv.models[ (int)ent->v.modelindex ]->flags == 0 && (ent->v.effects == EF_NODRAW || scale <= 0 || alpha <= 0))
-                                               continue;
-                               }
-                               else // no model and no effects
-                                       continue;
-                       }
+                       VectorMA(cs->origin, scale, model->normalmins, cullmins);
+                       VectorMA(cs->origin, scale, model->normalmaxs, cullmaxs);
+               }
+       }
+       else
+       {
+               // if there is no model (or it could not be loaded), use the physics box
+               VectorAdd(cs->origin, ent->fields.server->mins, cullmins);
+               VectorAdd(cs->origin, ent->fields.server->maxs, cullmaxs);
+       }
+       if (specialvisibilityradius)
+       {
+               cullmins[0] = min(cullmins[0], cs->origin[0] - specialvisibilityradius);
+               cullmins[1] = min(cullmins[1], cs->origin[1] - specialvisibilityradius);
+               cullmins[2] = min(cullmins[2], cs->origin[2] - specialvisibilityradius);
+               cullmaxs[0] = max(cullmaxs[0], cs->origin[0] + specialvisibilityradius);
+               cullmaxs[1] = max(cullmaxs[1], cs->origin[1] + specialvisibilityradius);
+               cullmaxs[2] = max(cullmaxs[2], cs->origin[2] + specialvisibilityradius);
+       }
+       if (!VectorCompare(cullmins, ent->priv.server->cullmins) || !VectorCompare(cullmaxs, ent->priv.server->cullmaxs))
+       {
+               VectorCopy(cullmins, ent->priv.server->cullmins);
+               VectorCopy(cullmaxs, ent->priv.server->cullmaxs);
+               ent->priv.server->pvs_numclusters = -1;
+               if (sv.worldmodel && sv.worldmodel->brush.FindBoxClusters)
+               {
+                       i = sv.worldmodel->brush.FindBoxClusters(sv.worldmodel, cullmins, cullmaxs, MAX_ENTITYCLUSTERS, ent->priv.server->pvs_clusterlist);
+                       if (i <= MAX_ENTITYCLUSTERS)
+                               ent->priv.server->pvs_numclusters = i;
                }
+       }
+
+       return true;
+}
 
-               if (msg->maxsize - msg->cursize < 32) // LordHavoc: increased check from 16 to 32
+void SV_PrepareEntitiesForSending(void)
+{
+       int e;
+       prvm_edict_t *ent;
+       // send all entities that touch the pvs
+       numsendentities = 0;
+       sendentitiesindex[0] = NULL;
+       memset(sendentitiesindex, 0, prog->num_edicts * sizeof(entity_state_t *));
+       for (e = 1, ent = PRVM_NEXT_EDICT(prog->edicts);e < prog->num_edicts;e++, ent = PRVM_NEXT_EDICT(ent))
+       {
+               if (!ent->priv.server->free && SV_PrepareEntityForSending(ent, sendentities + numsendentities, e))
                {
-                       Con_Printf ("packet overflow\n");
-                       return;
+                       sendentitiesindex[e] = sendentities + numsendentities;
+                       numsendentities++;
                }
+       }
+}
 
-// send an update
-               bits = 0;
+static int sententitiesmark = 0;
+static int sententities[MAX_EDICTS];
+static int sententitiesconsideration[MAX_EDICTS];
+static int sv_writeentitiestoclient_culled_pvs;
+static int sv_writeentitiestoclient_culled_trace;
+static int sv_writeentitiestoclient_visibleentities;
+static int sv_writeentitiestoclient_totalentities;
+//static entity_frame_t sv_writeentitiestoclient_entityframe;
+static int sv_writeentitiestoclient_clentnum;
+static vec3_t sv_writeentitiestoclient_testeye;
+static client_t *sv_writeentitiestoclient_client;
+
+void SV_MarkWriteEntityStateToClient(entity_state_t *s)
+{
+       int isbmodel;
+       vec3_t testorigin;
+       model_t *model;
+       prvm_edict_t *ed;
+       trace_t trace;
+       if (sententitiesconsideration[s->number] == sententitiesmark)
+               return;
+       sententitiesconsideration[s->number] = sententitiesmark;
+       sv_writeentitiestoclient_totalentities++;
 
-               dodelta = FALSE;
-               if ((int)ent->v.effects & EF_DELTA)
-                       dodelta = sv.time < client->nextfullupdate[e]; // every half second a full update is forced
+       if (s->customizeentityforclient)
+       {
+               prog->globals.server->self = s->number;
+               prog->globals.server->other = sv_writeentitiestoclient_clentnum;
+               PRVM_ExecuteProgram(s->customizeentityforclient, "customizeentityforclient: NULL function");
+               if(!PRVM_G_FLOAT(OFS_RETURN) || !SV_PrepareEntityForSending(PRVM_EDICT_NUM(s->number), s, s->number))
+                       return;
+       }
+
+       // never reject player
+       if (s->number != sv_writeentitiestoclient_clentnum)
+       {
+               // check various rejection conditions
+               if (s->nodrawtoclient == sv_writeentitiestoclient_clentnum)
+                       return;
+               if (s->drawonlytoclient && s->drawonlytoclient != sv_writeentitiestoclient_clentnum)
+                       return;
+               if (s->effects & EF_NODRAW)
+                       return;
+               // LordHavoc: only send entities with a model or important effects
+               if (!s->modelindex && s->specialvisibilityradius == 0)
+                       return;
 
-               if (dodelta)
+               // viewmodels don't have visibility checking
+               if (s->viewmodelforclient)
                {
-                       bits |= U_DELTA;
-                       baseline = &ent->deltabaseline;
+                       if (s->viewmodelforclient != sv_writeentitiestoclient_clentnum)
+                               return;
                }
-               else
+               else if (s->tagentity)
                {
-                       client->nextfullupdate[e] = sv.time + 0.5;
-                       baseline = &ent->baseline;
+                       // tag attached entities simply check their parent
+                       if (!sendentitiesindex[s->tagentity])
+                               return;
+                       SV_MarkWriteEntityStateToClient(sendentitiesindex[s->tagentity]);
+                       if (sententities[s->tagentity] != sententitiesmark)
+                               return;
                }
-
-               if (e >= 256)
-                       bits |= U_LONGENTITY;
-               if (ent->v.movetype == MOVETYPE_STEP)
-                       bits |= U_STEP;
-               
-               if (ent->v.movetype == MOVETYPE_STEP && ((int) ent->v.flags & (FL_ONGROUND | FL_FLY | FL_SWIM))) // monsters have smoothed walking/flying/swimming movement
+               // always send world submodels in newer protocols because they don't
+               // generate much traffic (in old protocols they hog bandwidth)
+               else if (!(s->effects & EF_NODEPTHTEST) && !((isbmodel = (model = sv.models[s->modelindex]) != NULL && model->name[0] == '*') && (sv.protocol != PROTOCOL_QUAKE && sv.protocol != PROTOCOL_QUAKEDP && sv.protocol != PROTOCOL_NEHAHRAMOVIE)))
                {
-                       if (!ent->steplerptime || ent->steplerptime > sv.time) // when the level just started...
+                       // entity has survived every check so far, check if visible
+                       ed = PRVM_EDICT_NUM(s->number);
+
+                       // if not touching a visible leaf
+                       if (sv_cullentities_pvs.integer && sv_writeentitiestoclient_pvsbytes)
                        {
-                               ent->steplerptime = sv.time;
-                               VectorCopy(ent->v.origin, ent->stepoldorigin);
-                               VectorCopy(ent->v.angles, ent->stepoldangles);
-                               VectorCopy(ent->v.origin, ent->steporigin);
-                               VectorCopy(ent->v.angles, ent->stepangles);
+                               if (ed->priv.server->pvs_numclusters < 0)
+                               {
+                                       // entity too big for clusters list
+                                       if (sv.worldmodel && sv.worldmodel->brush.BoxTouchingPVS && !sv.worldmodel->brush.BoxTouchingPVS(sv.worldmodel, sv_writeentitiestoclient_pvs, ed->priv.server->cullmins, ed->priv.server->cullmaxs))
+                                       {
+                                               sv_writeentitiestoclient_culled_pvs++;
+                                               return;
+                                       }
+                               }
+                               else
+                               {
+                                       int i;
+                                       // check cached clusters list
+                                       for (i = 0;i < ed->priv.server->pvs_numclusters;i++)
+                                               if (CHECKPVSBIT(sv_writeentitiestoclient_pvs, ed->priv.server->pvs_clusterlist[i]))
+                                                       break;
+                                       if (i == ed->priv.server->pvs_numclusters)
+                                       {
+                                               sv_writeentitiestoclient_culled_pvs++;
+                                               return;
+                                       }
+                               }
                        }
-                       VectorSubtract(ent->v.origin, ent->steporigin, origin);
-                       VectorSubtract(ent->v.angles, ent->stepangles, angles);
-                       if (DotProduct(origin, origin) >= 0.125 || DotProduct(angles, angles) >= 1.4)
+
+                       // or not seen by random tracelines
+                       if (sv_cullentities_trace.integer && !isbmodel)
                        {
-                               // update lerp positions
-                               ent->steplerptime = sv.time;
-                               VectorCopy(ent->steporigin, ent->stepoldorigin);
-                               VectorCopy(ent->stepangles, ent->stepoldangles);
-                               VectorCopy(ent->v.origin, ent->steporigin);
-                               VectorCopy(ent->v.angles, ent->stepangles);
+                               // LordHavoc: test center first
+                               testorigin[0] = (ed->priv.server->cullmins[0] + ed->priv.server->cullmaxs[0]) * 0.5f;
+                               testorigin[1] = (ed->priv.server->cullmins[1] + ed->priv.server->cullmaxs[1]) * 0.5f;
+                               testorigin[2] = (ed->priv.server->cullmins[2] + ed->priv.server->cullmaxs[2]) * 0.5f;
+                               sv.worldmodel->TraceBox(sv.worldmodel, 0, &trace, sv_writeentitiestoclient_testeye, vec3_origin, vec3_origin, testorigin, SUPERCONTENTS_SOLID);
+                               if (trace.fraction == 1 || BoxesOverlap(trace.endpos, trace.endpos, ed->priv.server->cullmins, ed->priv.server->cullmaxs))
+                                       sv_writeentitiestoclient_client->visibletime[s->number] = realtime + 1;
+                               else
+                               {
+                                       // LordHavoc: test random offsets, to maximize chance of detection
+                                       testorigin[0] = lhrandom(ed->priv.server->cullmins[0], ed->priv.server->cullmaxs[0]);
+                                       testorigin[1] = lhrandom(ed->priv.server->cullmins[1], ed->priv.server->cullmaxs[1]);
+                                       testorigin[2] = lhrandom(ed->priv.server->cullmins[2], ed->priv.server->cullmaxs[2]);
+                                       sv.worldmodel->TraceBox(sv.worldmodel, 0, &trace, sv_writeentitiestoclient_testeye, vec3_origin, vec3_origin, testorigin, SUPERCONTENTS_SOLID);
+                                       if (trace.fraction == 1 || BoxesOverlap(trace.endpos, trace.endpos, ed->priv.server->cullmins, ed->priv.server->cullmaxs))
+                                               sv_writeentitiestoclient_client->visibletime[s->number] = realtime + 1;
+                                       else
+                                       {
+                                               if (s->specialvisibilityradius)
+                                               {
+                                                       // LordHavoc: test random offsets, to maximize chance of detection
+                                                       testorigin[0] = lhrandom(ed->priv.server->cullmins[0], ed->priv.server->cullmaxs[0]);
+                                                       testorigin[1] = lhrandom(ed->priv.server->cullmins[1], ed->priv.server->cullmaxs[1]);
+                                                       testorigin[2] = lhrandom(ed->priv.server->cullmins[2], ed->priv.server->cullmaxs[2]);
+                                                       sv.worldmodel->TraceBox(sv.worldmodel, 0, &trace, sv_writeentitiestoclient_testeye, vec3_origin, vec3_origin, testorigin, SUPERCONTENTS_SOLID);
+                                                       if (trace.fraction == 1 || BoxesOverlap(trace.endpos, trace.endpos, ed->priv.server->cullmins, ed->priv.server->cullmaxs))
+                                                               sv_writeentitiestoclient_client->visibletime[s->number] = realtime + 1;
+                                               }
+                                       }
+                               }
+                               if (realtime > sv_writeentitiestoclient_client->visibletime[s->number])
+                               {
+                                       sv_writeentitiestoclient_culled_trace++;
+                                       return;
+                               }
                        }
-                       movelerp = (sv.time - ent->steplerptime) * 10.0;
-                       if (movelerp > 1) movelerp = 1;
-                       moveilerp = 1 - movelerp;
-                       origin[0] = ent->stepoldorigin[0] * moveilerp + ent->steporigin[0] * movelerp;
-                       origin[1] = ent->stepoldorigin[1] * moveilerp + ent->steporigin[1] * movelerp;
-                       origin[2] = ent->stepoldorigin[2] * moveilerp + ent->steporigin[2] * movelerp;
-                       // choose shortest rotate (to avoid 'spin around' situations)
-                       VectorSubtract(ent->stepangles, ent->stepoldangles, angles);
-                       if (angles[0] < -180) angles[0] += 360;if (angles[0] >= 180) angles[0] -= 360;
-                       if (angles[1] < -180) angles[1] += 360;if (angles[1] >= 180) angles[1] -= 360;
-                       if (angles[2] < -180) angles[2] += 360;if (angles[2] >= 180) angles[2] -= 360;
-                       angles[0] = angles[0] * movelerp + ent->stepoldangles[0];
-                       angles[1] = angles[1] * movelerp + ent->stepoldangles[1];
-                       angles[2] = angles[2] * movelerp + ent->stepoldangles[2];
-                       VectorMA(origin, host_client->latency, ent->v.velocity, origin);
                }
-               else // copy as they are
+       }
+
+       // this just marks it for sending
+       // FIXME: it would be more efficient to send here, but the entity
+       // compressor isn't that flexible
+       sv_writeentitiestoclient_visibleentities++;
+       sententities[s->number] = sententitiesmark;
+}
+
+entity_state_t sendstates[MAX_EDICTS];
+extern int csqc_clent;
+
+void SV_WriteEntitiesToClient(client_t *client, prvm_edict_t *clent, sizebuf_t *msg, int *stats)
+{
+       int i, numsendstates;
+       entity_state_t *s;
+
+       // if there isn't enough space to accomplish anything, skip it
+       if (msg->cursize + 25 > msg->maxsize)
+               return;
+
+       sv_writeentitiestoclient_client = client;
+
+       sv_writeentitiestoclient_culled_pvs = 0;
+       sv_writeentitiestoclient_culled_trace = 0;
+       sv_writeentitiestoclient_visibleentities = 0;
+       sv_writeentitiestoclient_totalentities = 0;
+
+// find the client's PVS
+       // the real place being tested from
+       VectorAdd(clent->fields.server->origin, clent->fields.server->view_ofs, sv_writeentitiestoclient_testeye);
+       sv_writeentitiestoclient_pvsbytes = 0;
+       if (sv.worldmodel && sv.worldmodel->brush.FatPVS)
+               sv_writeentitiestoclient_pvsbytes = sv.worldmodel->brush.FatPVS(sv.worldmodel, sv_writeentitiestoclient_testeye, 8, sv_writeentitiestoclient_pvs, sizeof(sv_writeentitiestoclient_pvs));
+
+       csqc_clent = sv_writeentitiestoclient_clentnum = PRVM_EDICT_TO_PROG(clent); // LordHavoc: for comparison purposes
+
+       sententitiesmark++;
+
+       for (i = 0;i < numsendentities;i++)
+               SV_MarkWriteEntityStateToClient(sendentities + i);
+
+       numsendstates = 0;
+       for (i = 0;i < numsendentities;i++)
+       {
+               if (sententities[sendentities[i].number] == sententitiesmark)
                {
-//                     VectorCopy(ent->v.origin, origin);
-                       VectorCopy(ent->v.angles, angles);
-                       VectorMA(ent->v.origin, host_client->latency, ent->v.velocity, origin);
-                       if (ent->v.movetype == MOVETYPE_STEP) // monster, but airborn, update lerp info
-                       {
-                               // update lerp positions
-                               ent->steplerptime = sv.time;
-                               VectorCopy(ent->v.origin, ent->stepoldorigin);
-                               VectorCopy(ent->v.angles, ent->stepoldangles);
-                               VectorCopy(ent->v.origin, ent->steporigin);
-                               VectorCopy(ent->v.angles, ent->stepangles);
-                       }
+                       s = &sendstates[numsendstates++];
+                       *s = sendentities[i];
+                       if (s->exteriormodelforclient && s->exteriormodelforclient == sv_writeentitiestoclient_clentnum)
+                               s->flags |= RENDER_EXTERIORMODEL;
                }
-
-               // LordHavoc: old stuff, but rewritten to have more exact tolerances
-               if ((int)(origin[0]*8.0) != (int)(baseline->origin[0]*8.0))                                             bits |= U_ORIGIN1;
-               if ((int)(origin[1]*8.0) != (int)(baseline->origin[1]*8.0))                                             bits |= U_ORIGIN2;
-               if ((int)(origin[2]*8.0) != (int)(baseline->origin[2]*8.0))                                             bits |= U_ORIGIN3;
-               if ((int)(angles[0]*(256.0/360.0)) != (int)(baseline->angles[0]*(256.0/360.0))) bits |= U_ANGLE1;
-               if ((int)(angles[1]*(256.0/360.0)) != (int)(baseline->angles[1]*(256.0/360.0))) bits |= U_ANGLE2;
-               if ((int)(angles[2]*(256.0/360.0)) != (int)(baseline->angles[2]*(256.0/360.0))) bits |= U_ANGLE3;
-               if (baseline->colormap != (int) ent->v.colormap)                                                                bits |= U_COLORMAP;
-               if (baseline->skin != (int) ent->v.skin)                                                                                bits |= U_SKIN;
-               if ((baseline->frame & 0x00FF) != ((int) ent->v.frame & 0x00FF))                                bits |= U_FRAME;
-               if ((baseline->effects & 0x00FF) != ((int) ent->v.effects & 0x00FF))                    bits |= U_EFFECTS;
-               if (baseline->modelindex != (int) ent->v.modelindex)                                                    bits |= U_MODEL;
-
-               // LordHavoc: new stuff
-               if (baseline->alpha != alpha)                                                                                                   bits |= U_ALPHA;
-               if (baseline->scale != scale)                                                                                                   bits |= U_SCALE;
-               if (((int) baseline->effects & 0xFF00) != ((int) ent->v.effects & 0xFF00))              bits |= U_EFFECTS2;
-               if (baseline->glowsize != glowsize)                                                                                             bits |= U_GLOWSIZE;
-               if (baseline->glowcolor != glowcolor)                                                                                   bits |= U_GLOWCOLOR;
-               if (baseline->colormod != colormod)                                                                                             bits |= U_COLORMOD;
-               if (((int) baseline->frame & 0xFF00) != ((int) ent->v.frame & 0xFF00))                  bits |= U_FRAME2;
-
-               // update delta baseline
-               VectorCopy(ent->v.origin, ent->deltabaseline.origin);
-               VectorCopy(ent->v.angles, ent->deltabaseline.angles);
-               ent->deltabaseline.colormap = ent->v.colormap;
-               ent->deltabaseline.skin = ent->v.skin;
-               ent->deltabaseline.frame = ent->v.frame;
-               ent->deltabaseline.effects = ent->v.effects;
-               ent->deltabaseline.modelindex = ent->v.modelindex;
-               ent->deltabaseline.alpha = alpha;
-               ent->deltabaseline.scale = scale;
-               ent->deltabaseline.glowsize = glowsize;
-               ent->deltabaseline.glowcolor = glowcolor;
-               ent->deltabaseline.colormod = colormod;
-
-               // write the message
-               if (bits >= 16777216)
-                       bits |= U_EXTEND2;
-               if (bits >= 65536)
-                       bits |= U_EXTEND1;
-               if (bits >= 256)
-                       bits |= U_MOREBITS;
-               bits |= U_SIGNAL;
-
-               MSG_WriteByte (msg, bits);
-               if (bits & U_MOREBITS)
-                       MSG_WriteByte (msg, bits>>8);
-               // LordHavoc: extend bytes have to be written here due to delta compression
-               if (bits & U_EXTEND1)
-                       MSG_WriteByte (msg, bits>>16);
-               if (bits & U_EXTEND2)
-                       MSG_WriteByte (msg, bits>>24);
-
-               // LordHavoc: old stuff
-               if (bits & U_LONGENTITY)
-                       MSG_WriteShort (msg,e);
-               else
-                       MSG_WriteByte (msg,e);
-               if (bits & U_MODEL)             MSG_WriteByte (msg,     ent->v.modelindex);
-               if (bits & U_FRAME)             MSG_WriteByte (msg, ent->v.frame);
-               if (bits & U_COLORMAP)  MSG_WriteByte (msg, ent->v.colormap);
-               if (bits & U_SKIN)              MSG_WriteByte (msg, ent->v.skin);
-               if (bits & U_EFFECTS)   MSG_WriteByte (msg, ent->v.effects);
-               if (bits & U_ORIGIN1)   MSG_WriteFloatCoord (msg, origin[0]);
-               if (bits & U_ANGLE1)    MSG_WriteAngle(msg, angles[0]);
-               if (bits & U_ORIGIN2)   MSG_WriteFloatCoord (msg, origin[1]);
-               if (bits & U_ANGLE2)    MSG_WriteAngle(msg, angles[1]);
-               if (bits & U_ORIGIN3)   MSG_WriteFloatCoord (msg, origin[2]);
-               if (bits & U_ANGLE3)    MSG_WriteAngle(msg, angles[2]);
-
-               // LordHavoc: new stuff
-               if (bits & U_ALPHA)             MSG_WriteByte(msg, alpha);
-               if (bits & U_SCALE)             MSG_WriteByte(msg, scale);
-               if (bits & U_EFFECTS2)  MSG_WriteByte(msg, (int)ent->v.effects >> 8);
-               if (bits & U_GLOWSIZE)  MSG_WriteByte(msg, glowsize);
-               if (bits & U_GLOWCOLOR) MSG_WriteByte(msg, glowcolor);
-               if (bits & U_COLORMOD)  MSG_WriteByte(msg, colormod);
-               if (bits & U_FRAME2)    MSG_WriteByte(msg, (int)ent->v.frame >> 8);
        }
+
+       if (sv_cullentities_stats.integer)
+               Con_Printf("client \"%s\" entities: %d total, %d visible, %d culled by: %d pvs %d trace\n", client->name, sv_writeentitiestoclient_totalentities, sv_writeentitiestoclient_visibleentities, sv_writeentitiestoclient_culled_pvs + sv_writeentitiestoclient_culled_trace, sv_writeentitiestoclient_culled_pvs, sv_writeentitiestoclient_culled_trace);
+
+       EntityFrameCSQC_WriteFrame(msg, numsendstates, sendstates);
+
+       if (client->entitydatabase5)
+               EntityFrame5_WriteFrame(msg, client->entitydatabase5, numsendstates, sendstates, client - svs.clients + 1, stats, client->movesequence);
+       else if (client->entitydatabase4)
+               EntityFrame4_WriteFrame(msg, client->entitydatabase4, numsendstates, sendstates);
+       else if (client->entitydatabase)
+               EntityFrame_WriteFrame(msg, client->entitydatabase, numsendstates, sendstates, client - svs.clients + 1);
+       else
+               EntityFrameQuake_WriteFrame(msg, numsendstates, sendstates);
 }
 
 /*
@@ -709,14 +939,11 @@ SV_CleanupEnts
 void SV_CleanupEnts (void)
 {
        int             e;
-       edict_t *ent;
-       
-       ent = NEXT_EDICT(sv.edicts);
-       for (e=1 ; e<sv.num_edicts ; e++, ent = NEXT_EDICT(ent))
-       {
-               ent->v.effects = (int)ent->v.effects & ~EF_MUZZLEFLASH;
-       }
+       prvm_edict_t    *ent;
 
+       ent = PRVM_NEXT_EDICT(prog->edicts);
+       for (e=1 ; e<prog->num_edicts ; e++, ent = PRVM_NEXT_EDICT(ent))
+               ent->fields.server->effects = (int)ent->fields.server->effects & ~EF_MUZZLEFLASH;
 }
 
 /*
@@ -725,28 +952,31 @@ SV_WriteClientdataToMessage
 
 ==================
 */
-void SV_WriteClientdataToMessage (edict_t *ent, sizebuf_t *msg)
+void SV_WriteClientdataToMessage (client_t *client, prvm_edict_t *ent, sizebuf_t *msg, int *stats)
 {
        int             bits;
        int             i;
-       edict_t *other;
+       prvm_edict_t    *other;
        int             items;
-       eval_t  *val;
+       prvm_eval_t     *val;
+       vec3_t  punchvector;
+       int             viewzoom;
+       const char *s;
 
 //
 // send a damage message
 //
-       if (ent->v.dmg_take || ent->v.dmg_save)
+       if (ent->fields.server->dmg_take || ent->fields.server->dmg_save)
        {
-               other = PROG_TO_EDICT(ent->v.dmg_inflictor);
+               other = PRVM_PROG_TO_EDICT(ent->fields.server->dmg_inflictor);
                MSG_WriteByte (msg, svc_damage);
-               MSG_WriteByte (msg, ent->v.dmg_save);
-               MSG_WriteByte (msg, ent->v.dmg_take);
+               MSG_WriteByte (msg, (int)ent->fields.server->dmg_save);
+               MSG_WriteByte (msg, (int)ent->fields.server->dmg_take);
                for (i=0 ; i<3 ; i++)
-                       MSG_WriteFloatCoord (msg, other->v.origin[i] + 0.5*(other->v.mins[i] + other->v.maxs[i]));
-       
-               ent->v.dmg_take = 0;
-               ent->v.dmg_save = 0;
+                       MSG_WriteCoord (msg, other->fields.server->origin[i] + 0.5*(other->fields.server->mins[i] + other->fields.server->maxs[i]), sv.protocol);
+
+               ent->fields.server->dmg_take = 0;
+               ent->fields.server->dmg_save = 0;
        }
 
 //
@@ -755,105 +985,189 @@ void SV_WriteClientdataToMessage (edict_t *ent, sizebuf_t *msg)
        SV_SetIdealPitch ();            // how much to look up / down ideally
 
 // a fixangle might get lost in a dropped packet.  Oh well.
-       if ( ent->v.fixangle )
+       if ( ent->fields.server->fixangle )
        {
                MSG_WriteByte (msg, svc_setangle);
                for (i=0 ; i < 3 ; i++)
-                       MSG_WriteAngle (msg, ent->v.angles[i] );
-               ent->v.fixangle = 0;
+                       MSG_WriteAngle (msg, ent->fields.server->angles[i], sv.protocol);
+               ent->fields.server->fixangle = 0;
        }
 
-       bits = 0;
-       
-       if (ent->v.view_ofs[2] != DEFAULT_VIEWHEIGHT)
-               bits |= SU_VIEWHEIGHT;
-               
-       if (ent->v.idealpitch)
-               bits |= SU_IDEALPITCH;
+       // stuff the sigil bits into the high bits of items for sbar, or else
+       // mix in items2
+       val = PRVM_GETEDICTFIELDVALUE(ent, eval_items2);
+       if (gamemode == GAME_HIPNOTIC || gamemode == GAME_ROGUE)
+               items = (int)ent->fields.server->items | ((int)val->_float << 23);
+       else
+               items = (int)ent->fields.server->items | ((int)prog->globals.server->serverflags << 28);
 
-// stuff the sigil bits into the high bits of items for sbar, or else
-// mix in items2
-       val = GETEDICTFIELDVALUE(ent, eval_items2);
+       VectorClear(punchvector);
+       if ((val = PRVM_GETEDICTFIELDVALUE(ent, eval_punchvector)))
+               VectorCopy(val->vector, punchvector);
 
-       if (val)
-               items = (int)ent->v.items | ((int)val->_float << 23);
-       else
-               items = (int)ent->v.items | ((int)pr_global_struct->serverflags << 28);
+       // cache weapon model name and index in client struct to save time
+       // (this search can be almost 1% of cpu time!)
+       s = PRVM_GetString(ent->fields.server->weaponmodel);
+       if (strcmp(s, client->weaponmodel))
+       {
+               strlcpy(client->weaponmodel, s, sizeof(client->weaponmodel));
+               client->weaponmodelindex = SV_ModelIndex(s, 1);
+       }
 
-       bits |= SU_ITEMS;
-       
-       if ( (int)ent->v.flags & FL_ONGROUND)
+       viewzoom = 255;
+       if ((val = PRVM_GETEDICTFIELDVALUE(ent, eval_viewzoom)))
+               viewzoom = (int)(val->_float * 255.0f);
+       if (viewzoom == 0)
+               viewzoom = 255;
+
+       bits = 0;
+
+       if ((int)ent->fields.server->flags & FL_ONGROUND)
                bits |= SU_ONGROUND;
-       
-       if ( ent->v.waterlevel >= 2)
+       if (ent->fields.server->waterlevel >= 2)
                bits |= SU_INWATER;
-       
+       if (ent->fields.server->idealpitch)
+               bits |= SU_IDEALPITCH;
+
        for (i=0 ; i<3 ; i++)
        {
-               if (ent->v.punchangle[i])
+               if (ent->fields.server->punchangle[i])
                        bits |= (SU_PUNCH1<<i);
-               if (ent->v.velocity[i])
+               if (sv.protocol != PROTOCOL_QUAKE && sv.protocol != PROTOCOL_QUAKEDP && sv.protocol != PROTOCOL_NEHAHRAMOVIE)
+                       if (punchvector[i])
+                               bits |= (SU_PUNCHVEC1<<i);
+               if (ent->fields.server->velocity[i])
                        bits |= (SU_VELOCITY1<<i);
        }
-       
-       if (ent->v.weaponframe)
-               bits |= SU_WEAPONFRAME;
 
-       if (ent->v.armorvalue)
-               bits |= SU_ARMOR;
-
-//     if (ent->v.weapon)
+       memset(stats, 0, sizeof(int[MAX_CL_STATS]));
+       stats[STAT_VIEWHEIGHT] = (int)ent->fields.server->view_ofs[2];
+       stats[STAT_ITEMS] = items;
+       stats[STAT_WEAPONFRAME] = (int)ent->fields.server->weaponframe;
+       stats[STAT_ARMOR] = (int)ent->fields.server->armorvalue;
+       stats[STAT_WEAPON] = client->weaponmodelindex;
+       stats[STAT_HEALTH] = (int)ent->fields.server->health;
+       stats[STAT_AMMO] = (int)ent->fields.server->currentammo;
+       stats[STAT_SHELLS] = (int)ent->fields.server->ammo_shells;
+       stats[STAT_NAILS] = (int)ent->fields.server->ammo_nails;
+       stats[STAT_ROCKETS] = (int)ent->fields.server->ammo_rockets;
+       stats[STAT_CELLS] = (int)ent->fields.server->ammo_cells;
+       stats[STAT_ACTIVEWEAPON] = (int)ent->fields.server->weapon;
+       stats[STAT_VIEWZOOM] = viewzoom;
+       // the QC bumps these itself by sending svc_'s, so we have to keep them
+       // zero or they'll be corrected by the engine
+       //stats[STAT_TOTALSECRETS] = prog->globals.server->total_secrets;
+       //stats[STAT_TOTALMONSTERS] = prog->globals.server->total_monsters;
+       //stats[STAT_SECRETS] = prog->globals.server->found_secrets;
+       //stats[STAT_MONSTERS] = prog->globals.server->killed_monsters;
+
+       if (sv.protocol == PROTOCOL_QUAKE || sv.protocol == PROTOCOL_QUAKEDP || sv.protocol == PROTOCOL_NEHAHRAMOVIE || sv.protocol == PROTOCOL_DARKPLACES1 || sv.protocol == PROTOCOL_DARKPLACES2 || sv.protocol == PROTOCOL_DARKPLACES3 || sv.protocol == PROTOCOL_DARKPLACES4 || sv.protocol == PROTOCOL_DARKPLACES5)
+       {
+               if (stats[STAT_VIEWHEIGHT] != DEFAULT_VIEWHEIGHT) bits |= SU_VIEWHEIGHT;
+               bits |= SU_ITEMS;
+               if (stats[STAT_WEAPONFRAME]) bits |= SU_WEAPONFRAME;
+               if (stats[STAT_ARMOR]) bits |= SU_ARMOR;
                bits |= SU_WEAPON;
+               // FIXME: which protocols support this?  does PROTOCOL_DARKPLACES3 support viewzoom?
+               if (sv.protocol == PROTOCOL_DARKPLACES2 || sv.protocol == PROTOCOL_DARKPLACES3 || sv.protocol == PROTOCOL_DARKPLACES4 || sv.protocol == PROTOCOL_DARKPLACES5)
+                       if (viewzoom != 255)
+                               bits |= SU_VIEWZOOM;
+       }
 
-// send the data
+       if (bits >= 65536)
+               bits |= SU_EXTEND1;
+       if (bits >= 16777216)
+               bits |= SU_EXTEND2;
 
+       // send the data
        MSG_WriteByte (msg, svc_clientdata);
        MSG_WriteShort (msg, bits);
+       if (bits & SU_EXTEND1)
+               MSG_WriteByte(msg, bits >> 16);
+       if (bits & SU_EXTEND2)
+               MSG_WriteByte(msg, bits >> 24);
 
        if (bits & SU_VIEWHEIGHT)
-               MSG_WriteChar (msg, ent->v.view_ofs[2]);
+               MSG_WriteChar (msg, stats[STAT_VIEWHEIGHT]);
 
        if (bits & SU_IDEALPITCH)
-               MSG_WriteChar (msg, ent->v.idealpitch);
+               MSG_WriteChar (msg, (int)ent->fields.server->idealpitch);
 
        for (i=0 ; i<3 ; i++)
        {
                if (bits & (SU_PUNCH1<<i))
-                       MSG_WriteChar (msg, ent->v.punchangle[i]);
+               {
+                       if (sv.protocol == PROTOCOL_QUAKE || sv.protocol == PROTOCOL_QUAKEDP || sv.protocol == PROTOCOL_NEHAHRAMOVIE)
+                               MSG_WriteChar(msg, (int)ent->fields.server->punchangle[i]);
+                       else
+                               MSG_WriteAngle16i(msg, ent->fields.server->punchangle[i]);
+               }
+               if (bits & (SU_PUNCHVEC1<<i))
+               {
+                       if (sv.protocol == PROTOCOL_DARKPLACES1 || sv.protocol == PROTOCOL_DARKPLACES2 || sv.protocol == PROTOCOL_DARKPLACES3 || sv.protocol == PROTOCOL_DARKPLACES4)
+                               MSG_WriteCoord16i(msg, punchvector[i]);
+                       else
+                               MSG_WriteCoord32f(msg, punchvector[i]);
+               }
                if (bits & (SU_VELOCITY1<<i))
-                       MSG_WriteChar (msg, ent->v.velocity[i]/16);
+               {
+                       if (sv.protocol == PROTOCOL_QUAKE || sv.protocol == PROTOCOL_DARKPLACES1 || sv.protocol == PROTOCOL_DARKPLACES2 || sv.protocol == PROTOCOL_DARKPLACES3 || sv.protocol == PROTOCOL_DARKPLACES4)
+                               MSG_WriteChar(msg, (int)(ent->fields.server->velocity[i] * (1.0f / 16.0f)));
+                       else
+                               MSG_WriteCoord32f(msg, ent->fields.server->velocity[i]);
+               }
        }
 
-// [always sent]       if (bits & SU_ITEMS)
-       MSG_WriteLong (msg, items);
-
-       if (bits & SU_WEAPONFRAME)
-               MSG_WriteByte (msg, ent->v.weaponframe);
-       if (bits & SU_ARMOR)
-               MSG_WriteByte (msg, ent->v.armorvalue);
-       if (bits & SU_WEAPON)
-               MSG_WriteByte (msg, SV_ModelIndex(pr_strings+ent->v.weaponmodel));
-       
-       MSG_WriteShort (msg, ent->v.health);
-       MSG_WriteByte (msg, ent->v.currentammo);
-       MSG_WriteByte (msg, ent->v.ammo_shells);
-       MSG_WriteByte (msg, ent->v.ammo_nails);
-       MSG_WriteByte (msg, ent->v.ammo_rockets);
-       MSG_WriteByte (msg, ent->v.ammo_cells);
-
-       if (standard_quake)
+       if (bits & SU_ITEMS)
+               MSG_WriteLong (msg, stats[STAT_ITEMS]);
+
+       if (sv.protocol == PROTOCOL_DARKPLACES5)
        {
-               MSG_WriteByte (msg, ent->v.weapon);
+               if (bits & SU_WEAPONFRAME)
+                       MSG_WriteShort (msg, stats[STAT_WEAPONFRAME]);
+               if (bits & SU_ARMOR)
+                       MSG_WriteShort (msg, stats[STAT_ARMOR]);
+               if (bits & SU_WEAPON)
+                       MSG_WriteShort (msg, stats[STAT_WEAPON]);
+               MSG_WriteShort (msg, stats[STAT_HEALTH]);
+               MSG_WriteShort (msg, stats[STAT_AMMO]);
+               MSG_WriteShort (msg, stats[STAT_SHELLS]);
+               MSG_WriteShort (msg, stats[STAT_NAILS]);
+               MSG_WriteShort (msg, stats[STAT_ROCKETS]);
+               MSG_WriteShort (msg, stats[STAT_CELLS]);
+               MSG_WriteShort (msg, stats[STAT_ACTIVEWEAPON]);
+               if (bits & SU_VIEWZOOM)
+                       MSG_WriteShort (msg, bound(0, stats[STAT_VIEWZOOM], 65535));
        }
-       else
+       else if (sv.protocol == PROTOCOL_QUAKE || sv.protocol == PROTOCOL_QUAKEDP || sv.protocol == PROTOCOL_NEHAHRAMOVIE || sv.protocol == PROTOCOL_DARKPLACES1 || sv.protocol == PROTOCOL_DARKPLACES2 || sv.protocol == PROTOCOL_DARKPLACES3 || sv.protocol == PROTOCOL_DARKPLACES4)
        {
-               for(i=0;i<32;i++)
+               if (bits & SU_WEAPONFRAME)
+                       MSG_WriteByte (msg, stats[STAT_WEAPONFRAME]);
+               if (bits & SU_ARMOR)
+                       MSG_WriteByte (msg, stats[STAT_ARMOR]);
+               if (bits & SU_WEAPON)
+                       MSG_WriteByte (msg, stats[STAT_WEAPON]);
+               MSG_WriteShort (msg, stats[STAT_HEALTH]);
+               MSG_WriteByte (msg, stats[STAT_AMMO]);
+               MSG_WriteByte (msg, stats[STAT_SHELLS]);
+               MSG_WriteByte (msg, stats[STAT_NAILS]);
+               MSG_WriteByte (msg, stats[STAT_ROCKETS]);
+               MSG_WriteByte (msg, stats[STAT_CELLS]);
+               if (gamemode == GAME_HIPNOTIC || gamemode == GAME_ROGUE || gamemode == GAME_NEXUIZ)
                {
-                       if ( ((int)ent->v.weapon) & (1<<i) )
-                       {
-                               MSG_WriteByte (msg, i);
-                               break;
-                       }
+                       for (i = 0;i < 32;i++)
+                               if (stats[STAT_WEAPON] & (1<<i))
+                                       break;
+                       MSG_WriteByte (msg, i);
+               }
+               else
+                       MSG_WriteByte (msg, stats[STAT_WEAPON]);
+               if (bits & SU_VIEWZOOM)
+               {
+                       if (sv.protocol == PROTOCOL_DARKPLACES2 || sv.protocol == PROTOCOL_DARKPLACES3 || sv.protocol == PROTOCOL_DARKPLACES4)
+                               MSG_WriteByte (msg, bound(0, stats[STAT_VIEWZOOM], 255));
+                       else
+                               MSG_WriteShort (msg, bound(0, stats[STAT_VIEWZOOM], 65535));
                }
        }
 }
@@ -863,35 +1177,75 @@ void SV_WriteClientdataToMessage (edict_t *ent, sizebuf_t *msg)
 SV_SendClientDatagram
 =======================
 */
-qboolean SV_SendClientDatagram (client_t *client)
+static unsigned char sv_sendclientdatagram_buf[NET_MAXMESSAGE]; // FIXME?
+void SV_SendClientDatagram (client_t *client)
 {
-       byte            buf[MAX_DATAGRAM];
-       sizebuf_t       msg;
-       
-       msg.data = buf;
-       msg.maxsize = sizeof(buf);
-       msg.cursize = 0;
-
-       MSG_WriteByte (&msg, svc_time);
-       MSG_WriteFloat (&msg, sv.time);
+       int rate, maxrate, maxsize, maxsize2;
+       sizebuf_t msg;
+       int stats[MAX_CL_STATS];
 
-// add the client specific data to the datagram
-       SV_WriteClientdataToMessage (client->edict, &msg);
-
-       SV_WriteEntitiesToClient (client, client->edict, &msg);
+       if (LHNETADDRESS_GetAddressType(&host_client->netconnection->peeraddress) == LHNETADDRESSTYPE_LOOP && !sv_ratelimitlocalplayer.integer)
+       {
+               // for good singleplayer, send huge packets
+               maxsize = sizeof(sv_sendclientdatagram_buf);
+               maxsize2 = sizeof(sv_sendclientdatagram_buf);
+       }
+       else if (sv.protocol == PROTOCOL_QUAKE || sv.protocol == PROTOCOL_QUAKEDP || sv.protocol == PROTOCOL_NEHAHRAMOVIE || sv.protocol == PROTOCOL_DARKPLACES1 || sv.protocol == PROTOCOL_DARKPLACES2 || sv.protocol == PROTOCOL_DARKPLACES3 || sv.protocol == PROTOCOL_DARKPLACES4)
+       {
+               // no rate limiting support on older protocols because dp protocols
+               // 1-4 kick the client off if they overflow, and quake protocol shows
+               // less than the full entity set if rate limited
+               maxsize = 1400;
+               maxsize2 = 1400;
+       }
+       else
+       {
+               // PROTOCOL_DARKPLACES5 and later support packet size limiting of updates
+               maxrate = bound(NET_MINRATE, sv_maxrate.integer, NET_MAXRATE);
+               if (sv_maxrate.integer != maxrate)
+                       Cvar_SetValueQuick(&sv_maxrate, maxrate);
+
+               // this rate limiting does not understand sys_ticrate 0
+               // (but no one should be running that on a server!)
+               rate = bound(NET_MINRATE, client->rate, maxrate);
+               rate = (int)(client->rate * sys_ticrate.value);
+               maxsize = bound(100, rate, 1400);
+               maxsize2 = 1400;
+       }
 
-// copy the server datagram if there is space
-       if (msg.cursize + sv.datagram.cursize < msg.maxsize)
-               SZ_Write (&msg, sv.datagram.data, sv.datagram.cursize);
+       msg.data = sv_sendclientdatagram_buf;
+       msg.maxsize = maxsize;
+       msg.cursize = 0;
 
-// send the datagram
-       if (NET_SendUnreliableMessage (client->netconnection, &msg) == -1)
+       if (host_client->spawned)
        {
-               SV_DropClient (true);// if the message couldn't send, kick off
-               return false;
+               MSG_WriteByte (&msg, svc_time);
+               MSG_WriteFloat (&msg, sv.time);
+
+               // add the client specific data to the datagram
+               SV_WriteClientdataToMessage (client, client->edict, &msg, stats);
+               VM_SV_WriteAutoSentStats (client, client->edict, &msg, stats);
+               SV_WriteEntitiesToClient (client, client->edict, &msg, stats);
+
+               // expand packet size to allow effects to go over the rate limit
+               // (dropping them is FAR too ugly)
+               msg.maxsize = maxsize2;
+
+               // copy the server datagram if there is space
+               // FIXME: put in delayed queue of effects to send
+               if (sv.datagram.cursize > 0 && msg.cursize + sv.datagram.cursize <= msg.maxsize)
+                       SZ_Write (&msg, sv.datagram.data, sv.datagram.cursize);
        }
-       
-       return true;
+       else if (realtime > client->keepalivetime)
+       {
+               // the player isn't totally in the game yet
+               // send small keepalive messages if too much time has passed
+               client->keepalivetime = realtime + 5;
+               MSG_WriteChar (&msg, svc_nop);
+       }
+
+// send the datagram
+       NetConn_SendUnreliableMessage (client->netconnection, &msg, sv.protocol);
 }
 
 /*
@@ -901,62 +1255,90 @@ SV_UpdateToReliableMessages
 */
 void SV_UpdateToReliableMessages (void)
 {
-       int                     i, j;
+       int i, j;
        client_t *client;
+       prvm_eval_t *val;
+       const char *name;
+       const char *model;
+       const char *skin;
 
 // check for changes to be sent over the reliable streams
-       for (i=0, host_client = svs.clients ; i<svs.maxclients ; i++, host_client++)
+       for (i = 0, host_client = svs.clients;i < svs.maxclients;i++, host_client++)
        {
-               if (host_client->old_frags != host_client->edict->v.frags)
+               // update the host_client fields we care about according to the entity fields
+               host_client->edict = PRVM_EDICT_NUM(i+1);
+
+               // DP_SV_CLIENTNAME
+               name = PRVM_GetString(host_client->edict->fields.server->netname);
+               if (name == NULL)
+                       name = "";
+               // always point the string back at host_client->name to keep it safe
+               strlcpy (host_client->name, name, sizeof (host_client->name));
+               host_client->edict->fields.server->netname = PRVM_SetEngineString(host_client->name);
+               if (strcmp(host_client->old_name, host_client->name))
                {
-                       for (j=0, client = svs.clients ; j<svs.maxclients ; j++, client++)
-                       {
-                               if (!client->active)
-                                       continue;
-                               MSG_WriteByte (&client->message, svc_updatefrags);
-                               MSG_WriteByte (&client->message, i);
-                               MSG_WriteShort (&client->message, host_client->edict->v.frags);
-                       }
-
-                       host_client->old_frags = host_client->edict->v.frags;
+                       if (host_client->spawned)
+                               SV_BroadcastPrintf("%s changed name to %s\n", host_client->old_name, host_client->name);
+                       strcpy(host_client->old_name, host_client->name);
+                       // send notification to all clients
+                       MSG_WriteByte (&sv.reliable_datagram, svc_updatename);
+                       MSG_WriteByte (&sv.reliable_datagram, i);
+                       MSG_WriteString (&sv.reliable_datagram, host_client->name);
                }
-       }
-       
-       for (j=0, client = svs.clients ; j<svs.maxclients ; j++, client++)
-       {
-               if (!client->active)
-                       continue;
-               SZ_Write (&client->message, sv.reliable_datagram.data, sv.reliable_datagram.cursize);
-       }
 
-       SZ_Clear (&sv.reliable_datagram);
-}
+               // DP_SV_CLIENTCOLORS
+               // this is always found (since it's added by the progs loader)
+               if ((val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_clientcolors)))
+                       host_client->colors = (int)val->_float;
+               if (host_client->old_colors != host_client->colors)
+               {
+                       host_client->old_colors = host_client->colors;
+                       // send notification to all clients
+                       MSG_WriteByte (&sv.reliable_datagram, svc_updatecolors);
+                       MSG_WriteByte (&sv.reliable_datagram, i);
+                       MSG_WriteByte (&sv.reliable_datagram, host_client->colors);
+               }
 
+               // NEXUIZ_PLAYERMODEL
+               if( eval_playermodel ) {
+                       model = PRVM_GetString(PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_playermodel)->string);
+                       if (model == NULL)
+                               model = "";
+                       // always point the string back at host_client->name to keep it safe
+                       strlcpy (host_client->playermodel, model, sizeof (host_client->playermodel));
+                       PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_playermodel)->string = PRVM_SetEngineString(host_client->playermodel);
+               }
 
-/*
-=======================
-SV_SendNop
+               // NEXUIZ_PLAYERSKIN
+               if( eval_playerskin ) {
+                       skin = PRVM_GetString(PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_playerskin)->string);
+                       if (skin == NULL)
+                               skin = "";
+                       // always point the string back at host_client->name to keep it safe
+                       strlcpy (host_client->playerskin, skin, sizeof (host_client->playerskin));
+                       PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_playerskin)->string = PRVM_SetEngineString(host_client->playerskin);
+               }
 
-Send a nop message without trashing or sending the accumulated client
-message buffer
-=======================
-*/
-void SV_SendNop (client_t *client)
-{
-       sizebuf_t       msg;
-       byte            buf[4];
-       
-       msg.data = buf;
-       msg.maxsize = sizeof(buf);
-       msg.cursize = 0;
+               // frags
+               host_client->frags = (int)host_client->edict->fields.server->frags;
+               if (host_client->old_frags != host_client->frags)
+               {
+                       host_client->old_frags = host_client->frags;
+                       // send notification to all clients
+                       MSG_WriteByte (&sv.reliable_datagram, svc_updatefrags);
+                       MSG_WriteByte (&sv.reliable_datagram, i);
+                       MSG_WriteShort (&sv.reliable_datagram, host_client->frags);
+               }
+       }
 
-       MSG_WriteChar (&msg, svc_nop);
+       for (j = 0, client = svs.clients;j < svs.maxclients;j++, client++)
+               if (client->netconnection)
+                       SZ_Write (&client->netconnection->message, sv.reliable_datagram.data, sv.reliable_datagram.cursize);
 
-       if (NET_SendUnreliableMessage (client->netconnection, &msg) == -1)
-               SV_DropClient (true);   // if the message couldn't send, kick off
-       client->last_message = realtime;
+       SZ_Clear (&sv.reliable_datagram);
 }
 
+
 /*
 =======================
 SV_SendClientMessages
@@ -964,71 +1346,39 @@ SV_SendClientMessages
 */
 void SV_SendClientMessages (void)
 {
-       int                     i;
-       
+       int i, prepared = false;
+
+       if (sv.protocol == PROTOCOL_QUAKEWORLD)
+               Sys_Error("SV_SendClientMessages: no quakeworld support\n");
+
 // update frags, names, etc
-       SV_UpdateToReliableMessages ();
+       SV_UpdateToReliableMessages();
 
 // build individual updates
-       for (i=0, host_client = svs.clients ; i<svs.maxclients ; i++, host_client++)
+       for (i = 0, host_client = svs.clients;i < svs.maxclients;i++, host_client++)
        {
                if (!host_client->active)
                        continue;
+               if (!host_client->netconnection)
+                       continue;
 
-               if (host_client->spawned)
-               {
-                       if (!SV_SendClientDatagram (host_client))
-                               continue;
-               }
-               else
-               {
-               // the player isn't totally in the game yet
-               // send small keepalive messages if too much time has passed
-               // send a full message when the next signon stage has been requested
-               // some other message data (name changes, etc) may accumulate 
-               // between signon stages
-                       if (!host_client->sendsignon)
-                       {
-                               if (realtime - host_client->last_message > 5)
-                                       SV_SendNop (host_client);
-                               continue;       // don't send out non-signon messages
-                       }
-               }
-
-               // check for an overflowed message.  Should only happen
-               // on a very fucked up connection that backs up a lot, then
-               // changes level
-               if (host_client->message.overflowed)
+               if (host_client->netconnection->message.overflowed)
                {
-                       SV_DropClient (true);
-                       host_client->message.overflowed = false;
+                       SV_DropClient (true);   // if the message couldn't send, kick off
                        continue;
                }
-                       
-               if (host_client->message.cursize || host_client->dropasap)
-               {
-                       if (!NET_CanSendMessage (host_client->netconnection))
-                       {
-//                             I_Printf ("can't write\n");
-                               continue;
-                       }
 
-                       if (host_client->dropasap)
-                               SV_DropClient (false);  // went to another level
-                       else
-                       {
-                               if (NET_SendMessage (host_client->netconnection, &host_client->message) == -1)
-                                       SV_DropClient (true);   // if the message couldn't send, kick off
-                               SZ_Clear (&host_client->message);
-                               host_client->last_message = realtime;
-                               host_client->sendsignon = false;
-                       }
+               if (!prepared)
+               {
+                       prepared = true;
+                       // only prepare entities once per frame
+                       SV_PrepareEntitiesForSending();
                }
+               SV_SendClientDatagram (host_client);
        }
-       
-       
+
 // clear muzzle flashes
-       SV_CleanupEnts ();
+       SV_CleanupEnts();
 }
 
 
@@ -1046,19 +1396,95 @@ SV_ModelIndex
 
 ================
 */
-int SV_ModelIndex (char *name)
+int SV_ModelIndex(const char *s, int precachemode)
 {
-       int             i;
-       
-       if (!name || !name[0])
+       int i, limit = ((sv.protocol == PROTOCOL_QUAKE || sv.protocol == PROTOCOL_QUAKEDP || sv.protocol == PROTOCOL_NEHAHRAMOVIE) ? 256 : MAX_MODELS);
+       char filename[MAX_QPATH];
+       if (!s || !*s)
                return 0;
+       // testing
+       //if (precachemode == 2)
+       //      return 0;
+       strlcpy(filename, s, sizeof(filename));
+       for (i = 2;i < limit;i++)
+       {
+               if (!sv.model_precache[i][0])
+               {
+                       if (precachemode)
+                       {
+                               if (sv.state != ss_loading && (sv.protocol == PROTOCOL_QUAKE || sv.protocol == PROTOCOL_QUAKEDP || sv.protocol == PROTOCOL_NEHAHRAMOVIE || sv.protocol == PROTOCOL_DARKPLACES1 || sv.protocol == PROTOCOL_DARKPLACES2 || sv.protocol == PROTOCOL_DARKPLACES3 || sv.protocol == PROTOCOL_DARKPLACES4 || sv.protocol == PROTOCOL_DARKPLACES5))
+                               {
+                                       Con_Printf("SV_ModelIndex(\"%s\"): precache_model can only be done in spawn functions\n", filename);
+                                       return 0;
+                               }
+                               if (precachemode == 1)
+                                       Con_Printf("SV_ModelIndex(\"%s\"): not precached (fix your code), precaching anyway\n", filename);
+                               strlcpy(sv.model_precache[i], filename, sizeof(sv.model_precache[i]));
+                               sv.models[i] = Mod_ForName (sv.model_precache[i], true, false, false);
+                               if (sv.state != ss_loading)
+                               {
+                                       MSG_WriteByte(&sv.reliable_datagram, svc_precache);
+                                       MSG_WriteShort(&sv.reliable_datagram, i);
+                                       MSG_WriteString(&sv.reliable_datagram, filename);
+                               }
+                               return i;
+                       }
+                       Con_Printf("SV_ModelIndex(\"%s\"): not precached\n", filename);
+                       return 0;
+               }
+               if (!strcmp(sv.model_precache[i], filename))
+                       return i;
+       }
+       Con_Printf("SV_ModelIndex(\"%s\"): i (%i) == MAX_MODELS (%i)\n", filename, i, MAX_MODELS);
+       return 0;
+}
+
+/*
+================
+SV_SoundIndex
 
-       for (i=0 ; i<MAX_MODELS && sv.model_precache[i] ; i++)
-               if (!strcmp(sv.model_precache[i], name))
+================
+*/
+int SV_SoundIndex(const char *s, int precachemode)
+{
+       int i, limit = ((sv.protocol == PROTOCOL_QUAKE || sv.protocol == PROTOCOL_QUAKEDP || sv.protocol == PROTOCOL_NEHAHRAMOVIE) ? 256 : MAX_SOUNDS);
+       char filename[MAX_QPATH];
+       if (!s || !*s)
+               return 0;
+       // testing
+       //if (precachemode == 2)
+       //      return 0;
+       strlcpy(filename, s, sizeof(filename));
+       for (i = 1;i < limit;i++)
+       {
+               if (!sv.sound_precache[i][0])
+               {
+                       if (precachemode)
+                       {
+                               if (sv.state != ss_loading && (sv.protocol == PROTOCOL_QUAKE || sv.protocol == PROTOCOL_QUAKEDP || sv.protocol == PROTOCOL_NEHAHRAMOVIE || sv.protocol == PROTOCOL_DARKPLACES1 || sv.protocol == PROTOCOL_DARKPLACES2 || sv.protocol == PROTOCOL_DARKPLACES3 || sv.protocol == PROTOCOL_DARKPLACES4 || sv.protocol == PROTOCOL_DARKPLACES5))
+                               {
+                                       Con_Printf("SV_SoundIndex(\"%s\"): precache_sound can only be done in spawn functions\n", filename);
+                                       return 0;
+                               }
+                               if (precachemode == 1)
+                                       Con_Printf("SV_SoundIndex(\"%s\"): not precached (fix your code), precaching anyway\n", filename);
+                               strlcpy(sv.sound_precache[i], filename, sizeof(sv.sound_precache[i]));
+                               if (sv.state != ss_loading)
+                               {
+                                       MSG_WriteByte(&sv.reliable_datagram, svc_precache);
+                                       MSG_WriteShort(&sv.reliable_datagram, i + 32768);
+                                       MSG_WriteString(&sv.reliable_datagram, filename);
+                               }
+                               return i;
+                       }
+                       Con_Printf("SV_SoundIndex(\"%s\"): not precached\n", filename);
+                       return 0;
+               }
+               if (!strcmp(sv.sound_precache[i], filename))
                        return i;
-       if (i==MAX_MODELS || !sv.model_precache[i])
-               Host_Error ("SV_ModelIndex: model %s not precached", name);
-       return i;
+       }
+       Con_Printf("SV_SoundIndex(\"%s\"): i (%i) == MAX_SOUNDS (%i)\n", filename, i, MAX_SOUNDS);
+       return 0;
 }
 
 /*
@@ -1069,87 +1495,71 @@ SV_CreateBaseline
 */
 void SV_CreateBaseline (void)
 {
-       int                     i;
-       edict_t                 *svent;
-       int                             entnum; 
-               
-       for (entnum = 0; entnum < sv.num_edicts ; entnum++)
+       int i, entnum, large;
+       prvm_edict_t *svent;
+
+       // LordHavoc: clear *all* states (note just active ones)
+       for (entnum = 0;entnum < prog->max_edicts;entnum++)
        {
-       // get the current server version
-               svent = EDICT_NUM(entnum);
-               if (svent->free)
+               // get the current server version
+               svent = PRVM_EDICT_NUM(entnum);
+
+               // LordHavoc: always clear state values, whether the entity is in use or not
+               svent->priv.server->baseline = defaultstate;
+
+               if (svent->priv.server->free)
                        continue;
-               if (entnum > svs.maxclients && !svent->v.modelindex)
+               if (entnum > svs.maxclients && !svent->fields.server->modelindex)
                        continue;
 
-       //
-       // create entity baseline
-       //
-               VectorCopy (svent->v.origin, svent->baseline.origin);
-               VectorCopy (svent->v.angles, svent->baseline.angles);
-               svent->baseline.frame = svent->v.frame;
-               svent->baseline.skin = svent->v.skin;
+               // create entity baseline
+               VectorCopy (svent->fields.server->origin, svent->priv.server->baseline.origin);
+               VectorCopy (svent->fields.server->angles, svent->priv.server->baseline.angles);
+               svent->priv.server->baseline.frame = (int)svent->fields.server->frame;
+               svent->priv.server->baseline.skin = (int)svent->fields.server->skin;
                if (entnum > 0 && entnum <= svs.maxclients)
                {
-                       svent->baseline.colormap = entnum;
-                       svent->baseline.modelindex = SV_ModelIndex("progs/player.mdl");
+                       svent->priv.server->baseline.colormap = entnum;
+                       svent->priv.server->baseline.modelindex = SV_ModelIndex("progs/player.mdl", 1);
+               }
+               else
+               {
+                       svent->priv.server->baseline.colormap = 0;
+                       svent->priv.server->baseline.modelindex = (int)svent->fields.server->modelindex;
+               }
+
+               large = false;
+               if (svent->priv.server->baseline.modelindex & 0xFF00 || svent->priv.server->baseline.frame & 0xFF00)
+                       large = true;
+
+               // add to the message
+               if (large)
+                       MSG_WriteByte (&sv.signon, svc_spawnbaseline2);
+               else
+                       MSG_WriteByte (&sv.signon, svc_spawnbaseline);
+               MSG_WriteShort (&sv.signon, entnum);
+
+               if (large)
+               {
+                       MSG_WriteShort (&sv.signon, svent->priv.server->baseline.modelindex);
+                       MSG_WriteShort (&sv.signon, svent->priv.server->baseline.frame);
                }
                else
                {
-                       svent->baseline.colormap = 0;
-                       svent->baseline.modelindex =
-                               SV_ModelIndex(pr_strings + svent->v.model);
+                       MSG_WriteByte (&sv.signon, svent->priv.server->baseline.modelindex);
+                       MSG_WriteByte (&sv.signon, svent->priv.server->baseline.frame);
                }
-               svent->baseline.alpha = 255;
-               svent->baseline.scale = 16;
-               svent->baseline.glowsize = 0;
-               svent->baseline.glowcolor = 254;
-               svent->baseline.colormod = 255;
-               
-       //
-       // add to the message
-       //
-               MSG_WriteByte (&sv.signon,svc_spawnbaseline);           
-               MSG_WriteShort (&sv.signon,entnum);
-
-               MSG_WriteByte (&sv.signon, svent->baseline.modelindex);
-               MSG_WriteByte (&sv.signon, svent->baseline.frame);
-               MSG_WriteByte (&sv.signon, svent->baseline.colormap);
-               MSG_WriteByte (&sv.signon, svent->baseline.skin);
+               MSG_WriteByte (&sv.signon, svent->priv.server->baseline.colormap);
+               MSG_WriteByte (&sv.signon, svent->priv.server->baseline.skin);
                for (i=0 ; i<3 ; i++)
                {
-                       MSG_WriteFloatCoord(&sv.signon, svent->baseline.origin[i]);
-                       MSG_WriteAngle(&sv.signon, svent->baseline.angles[i]);
+                       MSG_WriteCoord(&sv.signon, svent->priv.server->baseline.origin[i], sv.protocol);
+                       MSG_WriteAngle(&sv.signon, svent->priv.server->baseline.angles[i], sv.protocol);
                }
        }
 }
 
 
-/*
-================
-SV_SendReconnect
-
-Tell all the clients that the server is changing levels
-================
-*/
-void SV_SendReconnect (void)
-{
-       char    data[128];
-       sizebuf_t       msg;
-
-       msg.data = data;
-       msg.cursize = 0;
-       msg.maxsize = sizeof(data);
-
-       MSG_WriteChar (&msg, svc_stufftext);
-       MSG_WriteString (&msg, "reconnect\n");
-       NET_SendToAll (&msg, 5);
-       
-       if (cls.state != ca_dedicated)
-               Cmd_ExecuteString ("reconnect\n", src_command);
-}
-
-
 /*
 ================
 SV_SaveSpawnparms
@@ -1162,22 +1572,63 @@ void SV_SaveSpawnparms (void)
 {
        int             i, j;
 
-       svs.serverflags = pr_global_struct->serverflags;
+       svs.serverflags = (int)prog->globals.server->serverflags;
 
-       for (i=0, host_client = svs.clients ; i<svs.maxclients ; i++, host_client++)
+       for (i = 0, host_client = svs.clients;i < svs.maxclients;i++, host_client++)
        {
                if (!host_client->active)
                        continue;
 
        // call the progs to get default spawn parms for the new client
-               pr_global_struct->self = EDICT_TO_PROG(host_client->edict);
-               PR_ExecuteProgram (pr_global_struct->SetChangeParms, "QC function SetChangeParms is missing");
+               prog->globals.server->self = PRVM_EDICT_TO_PROG(host_client->edict);
+               PRVM_ExecuteProgram (prog->globals.server->SetChangeParms, "QC function SetChangeParms is missing");
                for (j=0 ; j<NUM_SPAWN_PARMS ; j++)
-                       host_client->spawn_parms[j] = (&pr_global_struct->parm1)[j];
+                       host_client->spawn_parms[j] = (&prog->globals.server->parm1)[j];
        }
 }
+/*
+void SV_IncreaseEdicts(void)
+{
+       int i;
+       prvm_edict_t *ent;
+       int oldmax_edicts = prog->max_edicts;
+       void *oldedictsengineprivate = prog->edictprivate;
+       void *oldedictsfields = prog->edictsfields;
+       void *oldmoved_edicts = sv.moved_edicts;
+
+       if (prog->max_edicts >= MAX_EDICTS)
+               return;
+
+       // links don't survive the transition, so unlink everything
+       for (i = 0, ent = prog->edicts;i < prog->max_edicts;i++, ent++)
+       {
+               if (!ent->priv.server->free)
+                       SV_UnlinkEdict(prog->edicts + i);
+               memset(&ent->priv.server->areagrid, 0, sizeof(ent->priv.server->areagrid));
+       }
+       SV_ClearWorld();
 
-qboolean isworldmodel;
+       prog->max_edicts   = min(prog->max_edicts + 256, MAX_EDICTS);
+       prog->edictprivate = PR_Alloc(prog->max_edicts * sizeof(edict_engineprivate_t));
+       prog->edictsfields = PR_Alloc(prog->max_edicts * prog->edict_size);
+       sv.moved_edicts = PR_Alloc(prog->max_edicts * sizeof(prvm_edict_t *));
+
+       memcpy(prog->edictprivate, oldedictsengineprivate, oldmax_edicts * sizeof(edict_engineprivate_t));
+       memcpy(prog->edictsfields, oldedictsfields, oldmax_edicts * prog->edict_size);
+
+       for (i = 0, ent = prog->edicts;i < prog->max_edicts;i++, ent++)
+       {
+               ent->priv.vp = (unsigned char*) prog->edictprivate + i * prog->edictprivate_size;
+               ent->fields.server = (void *)((unsigned char *)prog->edictsfields + i * prog->edict_size);
+               // link every entity except world
+               if (!ent->priv.server->free)
+                       SV_LinkEdict(ent, false);
+       }
+
+       PR_Free(oldedictsengineprivate);
+       PR_Free(oldedictsfields);
+       PR_Free(oldmoved_edicts);
+}*/
 
 /*
 ================
@@ -1188,17 +1639,32 @@ This is called at the start of each level
 */
 extern float           scr_centertime_off;
 
-void SV_SpawnServer (char *server)
+void SV_SpawnServer (const char *server)
 {
-       edict_t         *ent;
-       int                     i;
+       prvm_edict_t *ent;
+       int i;
+       char *entities;
+       model_t *worldmodel;
+       char modelname[sizeof(sv.modelname)];
+
+       Con_DPrintf("SpawnServer: %s\n", server);
+
+       if (cls.state != ca_dedicated)
+               SCR_BeginLoadingPlaque();
+
+       dpsnprintf (modelname, sizeof(modelname), "maps/%s.bsp", server);
+       worldmodel = Mod_ForName(modelname, false, true, true);
+       if (!worldmodel || !worldmodel->TraceBox)
+       {
+               Con_Printf("Couldn't load map %s\n", modelname);
+               return;
+       }
 
        // let's not have any servers with no name
        if (hostname.string[0] == 0)
                Cvar_Set ("hostname", "UNNAMED");
        scr_centertime_off = 0;
 
-       Con_DPrintf ("SpawnServer: %s\n",server);
        svs.changelevel_issued = false;         // now safe to issue another
 
 //
@@ -1206,135 +1672,704 @@ void SV_SpawnServer (char *server)
 //
        if (sv.active)
        {
-               SV_SendReconnect ();
+               client_t *client;
+               for (i = 0, client = svs.clients;i < svs.maxclients;i++, client++)
+               {
+                       if (client->netconnection)
+                       {
+                               MSG_WriteByte(&client->netconnection->message, svc_stufftext);
+                               MSG_WriteString(&client->netconnection->message, "reconnect\n");
+                       }
+               }
+       }
+       else
+       {
+               // open server port
+               NetConn_OpenServerPorts(true);
        }
 
 //
 // make cvars consistant
 //
-       if (coop.value)
+       if (coop.integer)
                Cvar_SetValue ("deathmatch", 0);
+       // LordHavoc: it can be useful to have skills outside the range 0-3...
+       //current_skill = bound(0, (int)(skill.value + 0.5), 3);
+       //Cvar_SetValue ("skill", (float)current_skill);
        current_skill = (int)(skill.value + 0.5);
-       if (current_skill < 0)
-               current_skill = 0;
-       if (current_skill > 3)
-               current_skill = 3;
 
-       Cvar_SetValue ("skill", (float)current_skill);
-       
 //
 // set up the new server
 //
-       Host_ClearMemory ();
-
        memset (&sv, 0, sizeof(sv));
+       // if running a local client, make sure it doesn't try to access the last
+       // level's data which is no longer valiud
+       cls.signon = 0;
+
+       SV_VM_Setup();
+
+       sv.active = true;
+
+       strlcpy (sv.name, server, sizeof (sv.name));
 
-       strcpy (sv.name, server);
+       sv.protocol = Protocol_EnumForName(sv_protocolname.string);
+       if (sv.protocol == PROTOCOL_UNKNOWN)
+       {
+               char buffer[1024];
+               Protocol_Names(buffer, sizeof(buffer));
+               Con_Printf("Unknown sv_protocolname \"%s\", valid values are:\n%s\n", sv_protocolname.string, buffer);
+               sv.protocol = PROTOCOL_QUAKE;
+       }
+
+       SV_VM_Begin();
 
 // load progs to get entity field count
-       PR_LoadProgs ();
+       //PR_LoadProgs ( sv_progs.string );
+
+       // allocate server memory
+       /*// start out with just enough room for clients and a reasonable estimate of entities
+       prog->max_edicts = max(svs.maxclients + 1, 512);
+       prog->max_edicts = min(prog->max_edicts, MAX_EDICTS);
+
+       // prvm_edict_t structures (hidden from progs)
+       prog->edicts = PR_Alloc(MAX_EDICTS * sizeof(prvm_edict_t));
+       // engine private structures (hidden from progs)
+       prog->edictprivate = PR_Alloc(prog->max_edicts * sizeof(edict_engineprivate_t));
+       // progs fields, often accessed by server
+       prog->edictsfields = PR_Alloc(prog->max_edicts * prog->edict_size);*/
+       // used by PushMove to move back pushed entities
+       sv.moved_edicts = (prvm_edict_t **)PRVM_Alloc(prog->max_edicts * sizeof(prvm_edict_t *));
+       /*for (i = 0;i < prog->max_edicts;i++)
+       {
+               ent = prog->edicts + i;
+               ent->priv.vp = (unsigned char*) prog->edictprivate + i * prog->edictprivate_size;
+               ent->fields.server = (void *)((unsigned char *)prog->edictsfields + i * prog->edict_size);
+       }*/
 
-// allocate server memory
-       sv.max_edicts = MAX_EDICTS;
-       
-       sv.edicts = Hunk_AllocName (sv.max_edicts*pr_edict_size, "edicts");
+       // reset client csqc entity versions right away.
+       for (i = 0, host_client = svs.clients;i < svs.maxclients;i++, host_client++)
+               EntityFrameCSQC_InitClientVersions(i, true);
 
        sv.datagram.maxsize = sizeof(sv.datagram_buf);
        sv.datagram.cursize = 0;
        sv.datagram.data = sv.datagram_buf;
-       
+
        sv.reliable_datagram.maxsize = sizeof(sv.reliable_datagram_buf);
        sv.reliable_datagram.cursize = 0;
        sv.reliable_datagram.data = sv.reliable_datagram_buf;
-       
+
        sv.signon.maxsize = sizeof(sv.signon_buf);
        sv.signon.cursize = 0;
        sv.signon.data = sv.signon_buf;
-       
+
 // leave slots at start for clients only
-       sv.num_edicts = svs.maxclients+1;
-       for (i=0 ; i<svs.maxclients ; i++)
-       {
-               ent = EDICT_NUM(i+1);
-               svs.clients[i].edict = ent;
-       }
-       
+       //prog->num_edicts = svs.maxclients+1;
+
        sv.state = ss_loading;
+       prog->allowworldwrites = true;
        sv.paused = false;
 
-       sv.time = 1.0;
-       
-       strcpy (sv.name, server);
-       sprintf (sv.modelname,"maps/%s.bsp", server);
-       isworldmodel = true; // LordHavoc: only load submodels on the world model
-       sv.worldmodel = Mod_ForName (sv.modelname, false);
-       isworldmodel = false;
-       if (!sv.worldmodel)
-       {
-               Con_Printf ("Couldn't spawn server %s\n", sv.modelname);
-               sv.active = false;
-               return;
-       }
+       *prog->time = sv.time = 1.0;
+
+       Mod_ClearUsed();
+       worldmodel->used = true;
+
+       strlcpy (sv.name, server, sizeof (sv.name));
+       strcpy(sv.modelname, modelname);
+       sv.worldmodel = worldmodel;
        sv.models[1] = sv.worldmodel;
-       
+
 //
 // clear world interaction links
 //
        SV_ClearWorld ();
-       
-       sv.sound_precache[0] = pr_strings;
 
-       sv.model_precache[0] = pr_strings;
-       sv.model_precache[1] = sv.modelname;
-       for (i=1 ; i<sv.worldmodel->numsubmodels ; i++)
+       strlcpy(sv.sound_precache[0], "", sizeof(sv.sound_precache[0]));
+
+       strlcpy(sv.model_precache[0], "", sizeof(sv.model_precache[0]));
+       strlcpy(sv.model_precache[1], sv.modelname, sizeof(sv.model_precache[1]));
+       for (i = 1;i < sv.worldmodel->brush.numsubmodels;i++)
        {
-               sv.model_precache[1+i] = localmodels[i];
-               sv.models[i+1] = Mod_ForName (localmodels[i], false);
+               dpsnprintf(sv.model_precache[i+1], sizeof(sv.model_precache[i+1]), "*%i", i);
+               sv.models[i+1] = Mod_ForName (sv.model_precache[i+1], false, false, false);
        }
 
 //
 // load the rest of the entities
-//     
-       ent = EDICT_NUM(0);
-       memset (&ent->v, 0, progs->entityfields * 4);
-       ent->free = false;
-       ent->v.model = sv.worldmodel->name - pr_strings;
-       ent->v.modelindex = 1;          // world model
-       ent->v.solid = SOLID_BSP;
-       ent->v.movetype = MOVETYPE_PUSH;
-       ent->v.angles[0] = ent->v.angles[1] = ent->v.angles[2] = 0;
+//
+       // AK possible hack since num_edicts is still 0
+       ent = PRVM_EDICT_NUM(0);
+       memset (ent->fields.server, 0, prog->progs->entityfields * 4);
+       ent->priv.server->free = false;
+       ent->fields.server->model = PRVM_SetEngineString(sv.modelname);
+       ent->fields.server->modelindex = 1;             // world model
+       ent->fields.server->solid = SOLID_BSP;
+       ent->fields.server->movetype = MOVETYPE_PUSH;
 
        if (coop.value)
-               pr_global_struct->coop = coop.value;
+               prog->globals.server->coop = coop.integer;
        else
-               pr_global_struct->deathmatch = deathmatch.value;
+               prog->globals.server->deathmatch = deathmatch.integer;
 
-       pr_global_struct->mapname = sv.name - pr_strings;
+       prog->globals.server->mapname = PRVM_SetEngineString(sv.name);
 
 // serverflags are for cross level information (sigils)
-       pr_global_struct->serverflags = svs.serverflags;
-       
-       ED_LoadFromFile (sv.worldmodel->entities);
-       // LordHavoc: clear world angles (to fix e3m3.bsp)
-       sv.edicts->v.angles[0] = sv.edicts->v.angles[1] = sv.edicts->v.angles[2] = 0;
+       prog->globals.server->serverflags = svs.serverflags;
 
-       sv.active = true;
+       // we need to reset the spawned flag on all connected clients here so that
+       // their thinks don't run during startup (before PutClientInServer)
+       // we also need to set up the client entities now
+       // and we need to set the ->edict pointers to point into the progs edicts
+       for (i = 0, host_client = svs.clients;i < svs.maxclients;i++, host_client++)
+       {
+               host_client->spawned = false;
+               host_client->edict = PRVM_EDICT_NUM(i + 1);
+               PRVM_ED_ClearEdict(host_client->edict);
+       }
+
+       // load replacement entity file if found
+       if (sv_entpatch.integer && (entities = (char *)FS_LoadFile(va("maps/%s.ent", sv.name), tempmempool, true, NULL)))
+       {
+               Con_Printf("Loaded maps/%s.ent\n", sv.name);
+               PRVM_ED_LoadFromFile (entities);
+               Mem_Free(entities);
+       }
+       else
+               PRVM_ED_LoadFromFile (sv.worldmodel->brush.entities);
+
+
+       // LordHavoc: clear world angles (to fix e3m3.bsp)
+       VectorClear(prog->edicts->fields.server->angles);
 
 // all setup is completed, any further precache statements are errors
        sv.state = ss_active;
-       
+       prog->allowworldwrites = false;
+
 // run two frames to allow everything to settle
-       host_frametime = 0.1;
-       SV_Physics ();
-       SV_Physics ();
+       for (i = 0;i < 2;i++)
+       {
+               sv.frametime = 0.1;
+               SV_Physics ();
+       }
+
+       Mod_PurgeUnused();
 
 // create a baseline for more efficient communications
-       SV_CreateBaseline ();
-
-// send serverinfo to all connected clients
-       for (i=0,host_client = svs.clients ; i<svs.maxclients ; i++, host_client++)
-               if (host_client->active)
-                       SV_SendServerinfo (host_client);
-       
-       Con_DPrintf ("Server spawned.\n");
+       if (sv.protocol == PROTOCOL_QUAKE || sv.protocol == PROTOCOL_QUAKEDP || sv.protocol == PROTOCOL_NEHAHRAMOVIE)
+               SV_CreateBaseline ();
+
+// send serverinfo to all connected clients, and set up botclients coming back from a level change
+       for (i = 0, host_client = svs.clients;i < svs.maxclients;i++, host_client++)
+       {
+               if (!host_client->active)
+                       continue;
+               if (host_client->netconnection)
+                       SV_SendServerinfo(host_client);
+               else
+               {
+                       int j;
+                       // if client is a botclient coming from a level change, we need to
+                       // set up client info that normally requires networking
+
+                       // copy spawn parms out of the client_t
+                       for (j=0 ; j< NUM_SPAWN_PARMS ; j++)
+                               (&prog->globals.server->parm1)[j] = host_client->spawn_parms[j];
+
+                       // call the spawn function
+                       host_client->clientconnectcalled = true;
+                       prog->globals.server->time = sv.time;
+                       prog->globals.server->self = PRVM_EDICT_TO_PROG(host_client->edict);
+                       PRVM_ExecuteProgram (prog->globals.server->ClientConnect, "QC function ClientConnect is missing");
+                       PRVM_ExecuteProgram (prog->globals.server->PutClientInServer, "QC function PutClientInServer is missing");
+                       host_client->spawned = true;
+               }
+       }
+
+       Con_DPrint("Server spawned.\n");
+       NetConn_Heartbeat (2);
+
+       SV_VM_End();
+}
+
+/////////////////////////////////////////////////////
+// SV VM stuff
+
+void SV_VM_CB_BeginIncreaseEdicts(void)
+{
+       int i;
+       prvm_edict_t *ent;
+
+       PRVM_Free( sv.moved_edicts );
+       sv.moved_edicts = (prvm_edict_t **)PRVM_Alloc(prog->max_edicts * sizeof(prvm_edict_t *));
+
+       // links don't survive the transition, so unlink everything
+       for (i = 0, ent = prog->edicts;i < prog->max_edicts;i++, ent++)
+       {
+               if (!ent->priv.server->free)
+                       SV_UnlinkEdict(prog->edicts + i);
+               memset(&ent->priv.server->areagrid, 0, sizeof(ent->priv.server->areagrid));
+       }
+       SV_ClearWorld();
+}
+
+void SV_VM_CB_EndIncreaseEdicts(void)
+{
+       int i;
+       prvm_edict_t *ent;
+
+       for (i = 0, ent = prog->edicts;i < prog->max_edicts;i++, ent++)
+       {
+               // link every entity except world
+               if (!ent->priv.server->free)
+                       SV_LinkEdict(ent, false);
+       }
+}
+
+void SV_VM_CB_InitEdict(prvm_edict_t *e)
+{
+       // LordHavoc: for consistency set these here
+       int num = PRVM_NUM_FOR_EDICT(e) - 1;
+
+       e->priv.server->move = false; // don't move on first frame
+
+       if (num >= 0 && num < svs.maxclients)
+       {
+               prvm_eval_t *val;
+               // set colormap and team on newly created player entity
+               e->fields.server->colormap = num + 1;
+               e->fields.server->team = (svs.clients[num].colors & 15) + 1;
+               // set netname/clientcolors back to client values so that
+               // DP_SV_CLIENTNAME and DP_SV_CLIENTCOLORS will not immediately
+               // reset them
+               e->fields.server->netname = PRVM_SetEngineString(svs.clients[num].name);
+               if ((val = PRVM_GETEDICTFIELDVALUE(e, eval_clientcolors)))
+                       val->_float = svs.clients[num].colors;
+               // NEXUIZ_PLAYERMODEL and NEXUIZ_PLAYERSKIN
+               if( eval_playermodel )
+                       PRVM_GETEDICTFIELDVALUE(e, eval_playermodel)->string = PRVM_SetEngineString(svs.clients[num].playermodel);
+               if( eval_playerskin )
+                       PRVM_GETEDICTFIELDVALUE(e, eval_playerskin)->string = PRVM_SetEngineString(svs.clients[num].playerskin);
+       }
+}
+
+void SV_VM_CB_FreeEdict(prvm_edict_t *ed)
+{
+       SV_UnlinkEdict (ed);            // unlink from world bsp
+
+       ed->fields.server->model = 0;
+       ed->fields.server->takedamage = 0;
+       ed->fields.server->modelindex = 0;
+       ed->fields.server->colormap = 0;
+       ed->fields.server->skin = 0;
+       ed->fields.server->frame = 0;
+       VectorClear(ed->fields.server->origin);
+       VectorClear(ed->fields.server->angles);
+       ed->fields.server->nextthink = -1;
+       ed->fields.server->solid = 0;
+}
+
+void SV_VM_CB_CountEdicts(void)
+{
+       int             i;
+       prvm_edict_t    *ent;
+       int             active, models, solid, step;
+
+       active = models = solid = step = 0;
+       for (i=0 ; i<prog->num_edicts ; i++)
+       {
+               ent = PRVM_EDICT_NUM(i);
+               if (ent->priv.server->free)
+                       continue;
+               active++;
+               if (ent->fields.server->solid)
+                       solid++;
+               if (ent->fields.server->model)
+                       models++;
+               if (ent->fields.server->movetype == MOVETYPE_STEP)
+                       step++;
+       }
+
+       Con_Printf("num_edicts:%3i\n", prog->num_edicts);
+       Con_Printf("active    :%3i\n", active);
+       Con_Printf("view      :%3i\n", models);
+       Con_Printf("touch     :%3i\n", solid);
+       Con_Printf("step      :%3i\n", step);
+}
+
+qboolean SV_VM_CB_LoadEdict(prvm_edict_t *ent)
+{
+       // remove things from different skill levels or deathmatch
+       if (gamemode != GAME_TRANSFUSION) //Transfusion does this in QC
+       {
+               if (deathmatch.integer)
+               {
+                       if (((int)ent->fields.server->spawnflags & SPAWNFLAG_NOT_DEATHMATCH))
+                       {
+                               return false;
+                       }
+               }
+               else if ((current_skill <= 0 && ((int)ent->fields.server->spawnflags & SPAWNFLAG_NOT_EASY  ))
+                       || (current_skill == 1 && ((int)ent->fields.server->spawnflags & SPAWNFLAG_NOT_MEDIUM))
+                       || (current_skill >= 2 && ((int)ent->fields.server->spawnflags & SPAWNFLAG_NOT_HARD  )))
+               {
+                       return false;
+               }
+       }
+       return true;
+}
+
+cvar_t pr_checkextension = {CVAR_READONLY, "pr_checkextension", "1", "indicates to QuakeC that the standard quakec extensions system is available (if 0, quakec should not attempt to use extensions)"};
+cvar_t nomonsters = {0, "nomonsters", "0", "unused cvar in quake, can be used by mods"};
+cvar_t gamecfg = {0, "gamecfg", "0", "unused cvar in quake, can be used by mods"};
+cvar_t scratch1 = {0, "scratch1", "0", "unused cvar in quake, can be used by mods"};
+cvar_t scratch2 = {0,"scratch2", "0", "unused cvar in quake, can be used by mods"};
+cvar_t scratch3 = {0, "scratch3", "0", "unused cvar in quake, can be used by mods"};
+cvar_t scratch4 = {0, "scratch4", "0", "unused cvar in quake, can be used by mods"};
+cvar_t savedgamecfg = {CVAR_SAVE, "savedgamecfg", "0", "unused cvar in quake that is saved to config.cfg on exit, can be used by mods"};
+cvar_t saved1 = {CVAR_SAVE, "saved1", "0", "unused cvar in quake that is saved to config.cfg on exit, can be used by mods"};
+cvar_t saved2 = {CVAR_SAVE, "saved2", "0", "unused cvar in quake that is saved to config.cfg on exit, can be used by mods"};
+cvar_t saved3 = {CVAR_SAVE, "saved3", "0", "unused cvar in quake that is saved to config.cfg on exit, can be used by mods"};
+cvar_t saved4 = {CVAR_SAVE, "saved4", "0", "unused cvar in quake that is saved to config.cfg on exit, can be used by mods"};
+cvar_t nehx00 = {0, "nehx00", "0", "nehahra data storage cvar (used in singleplayer)"};
+cvar_t nehx01 = {0, "nehx01", "0", "nehahra data storage cvar (used in singleplayer)"};
+cvar_t nehx02 = {0, "nehx02", "0", "nehahra data storage cvar (used in singleplayer)"};
+cvar_t nehx03 = {0, "nehx03", "0", "nehahra data storage cvar (used in singleplayer)"};
+cvar_t nehx04 = {0, "nehx04", "0", "nehahra data storage cvar (used in singleplayer)"};
+cvar_t nehx05 = {0, "nehx05", "0", "nehahra data storage cvar (used in singleplayer)"};
+cvar_t nehx06 = {0, "nehx06", "0", "nehahra data storage cvar (used in singleplayer)"};
+cvar_t nehx07 = {0, "nehx07", "0", "nehahra data storage cvar (used in singleplayer)"};
+cvar_t nehx08 = {0, "nehx08", "0", "nehahra data storage cvar (used in singleplayer)"};
+cvar_t nehx09 = {0, "nehx09", "0", "nehahra data storage cvar (used in singleplayer)"};
+cvar_t nehx10 = {0, "nehx10", "0", "nehahra data storage cvar (used in singleplayer)"};
+cvar_t nehx11 = {0, "nehx11", "0", "nehahra data storage cvar (used in singleplayer)"};
+cvar_t nehx12 = {0, "nehx12", "0", "nehahra data storage cvar (used in singleplayer)"};
+cvar_t nehx13 = {0, "nehx13", "0", "nehahra data storage cvar (used in singleplayer)"};
+cvar_t nehx14 = {0, "nehx14", "0", "nehahra data storage cvar (used in singleplayer)"};
+cvar_t nehx15 = {0, "nehx15", "0", "nehahra data storage cvar (used in singleplayer)"};
+cvar_t nehx16 = {0, "nehx16", "0", "nehahra data storage cvar (used in singleplayer)"};
+cvar_t nehx17 = {0, "nehx17", "0", "nehahra data storage cvar (used in singleplayer)"};
+cvar_t nehx18 = {0, "nehx18", "0", "nehahra data storage cvar (used in singleplayer)"};
+cvar_t nehx19 = {0, "nehx19", "0", "nehahra data storage cvar (used in singleplayer)"};
+cvar_t cutscene = {0, "cutscene", "1", "enables cutscenes in nehahra, can be used by other mods"};
+
+void SV_VM_Init(void)
+{
+       Cvar_RegisterVariable (&pr_checkextension);
+       Cvar_RegisterVariable (&nomonsters);
+       Cvar_RegisterVariable (&gamecfg);
+       Cvar_RegisterVariable (&scratch1);
+       Cvar_RegisterVariable (&scratch2);
+       Cvar_RegisterVariable (&scratch3);
+       Cvar_RegisterVariable (&scratch4);
+       Cvar_RegisterVariable (&savedgamecfg);
+       Cvar_RegisterVariable (&saved1);
+       Cvar_RegisterVariable (&saved2);
+       Cvar_RegisterVariable (&saved3);
+       Cvar_RegisterVariable (&saved4);
+       // LordHavoc: Nehahra uses these to pass data around cutscene demos
+       if (gamemode == GAME_NEHAHRA)
+       {
+               Cvar_RegisterVariable (&nehx00);
+               Cvar_RegisterVariable (&nehx01);
+               Cvar_RegisterVariable (&nehx02);
+               Cvar_RegisterVariable (&nehx03);
+               Cvar_RegisterVariable (&nehx04);
+               Cvar_RegisterVariable (&nehx05);
+               Cvar_RegisterVariable (&nehx06);
+               Cvar_RegisterVariable (&nehx07);
+               Cvar_RegisterVariable (&nehx08);
+               Cvar_RegisterVariable (&nehx09);
+               Cvar_RegisterVariable (&nehx10);
+               Cvar_RegisterVariable (&nehx11);
+               Cvar_RegisterVariable (&nehx12);
+               Cvar_RegisterVariable (&nehx13);
+               Cvar_RegisterVariable (&nehx14);
+               Cvar_RegisterVariable (&nehx15);
+               Cvar_RegisterVariable (&nehx16);
+               Cvar_RegisterVariable (&nehx17);
+               Cvar_RegisterVariable (&nehx18);
+               Cvar_RegisterVariable (&nehx19);
+       }
+       Cvar_RegisterVariable (&cutscene); // for Nehahra but useful to other mods as well
+}
+
+// LordHavoc: in an effort to eliminate time wasted on GetEdictFieldValue...  these are defined as externs in progs.h
+int eval_gravity;
+int eval_button3;
+int eval_button4;
+int eval_button5;
+int eval_button6;
+int eval_button7;
+int eval_button8;
+int eval_button9;
+int eval_button10;
+int eval_button11;
+int eval_button12;
+int eval_button13;
+int eval_button14;
+int eval_button15;
+int eval_button16;
+int eval_buttonuse;
+int eval_buttonchat;
+int eval_glow_size;
+int eval_glow_trail;
+int eval_glow_color;
+int eval_items2;
+int eval_scale;
+int eval_alpha;
+int eval_renderamt; // HalfLife support
+int eval_rendermode; // HalfLife support
+int eval_fullbright;
+int eval_ammo_shells1;
+int eval_ammo_nails1;
+int eval_ammo_lava_nails;
+int eval_ammo_rockets1;
+int eval_ammo_multi_rockets;
+int eval_ammo_cells1;
+int eval_ammo_plasma;
+int eval_idealpitch;
+int eval_pitch_speed;
+int eval_viewmodelforclient;
+int eval_nodrawtoclient;
+int eval_exteriormodeltoclient;
+int eval_drawonlytoclient;
+int eval_ping;
+int eval_movement;
+int eval_pmodel;
+int eval_punchvector;
+int eval_viewzoom;
+int eval_clientcolors;
+int eval_tag_entity;
+int eval_tag_index;
+int eval_light_lev;
+int eval_color;
+int eval_style;
+int eval_pflags;
+int eval_cursor_active;
+int eval_cursor_screen;
+int eval_cursor_trace_start;
+int eval_cursor_trace_endpos;
+int eval_cursor_trace_ent;
+int eval_colormod;
+int eval_playermodel;
+int eval_playerskin;
+int eval_SendEntity;
+int eval_Version;
+int eval_customizeentityforclient;
+int eval_dphitcontentsmask;
+
+int gval_trace_dpstartcontents;
+int gval_trace_dphitcontents;
+int gval_trace_dphitq3surfaceflags;
+int gval_trace_dphittexturename;
+
+mfunction_t *SV_PlayerPhysicsQC;
+mfunction_t *EndFrameQC;
+//KrimZon - SERVER COMMANDS IN QUAKEC
+mfunction_t *SV_ParseClientCommandQC;
+
+ddef_t *PRVM_ED_FindGlobal(const char *name);
+
+void SV_VM_FindEdictFieldOffsets(void)
+{
+       eval_gravity = PRVM_ED_FindFieldOffset("gravity");
+       eval_button3 = PRVM_ED_FindFieldOffset("button3");
+       eval_button4 = PRVM_ED_FindFieldOffset("button4");
+       eval_button5 = PRVM_ED_FindFieldOffset("button5");
+       eval_button6 = PRVM_ED_FindFieldOffset("button6");
+       eval_button7 = PRVM_ED_FindFieldOffset("button7");
+       eval_button8 = PRVM_ED_FindFieldOffset("button8");
+       eval_button9 = PRVM_ED_FindFieldOffset("button9");
+       eval_button10 = PRVM_ED_FindFieldOffset("button10");
+       eval_button11 = PRVM_ED_FindFieldOffset("button11");
+       eval_button12 = PRVM_ED_FindFieldOffset("button12");
+       eval_button13 = PRVM_ED_FindFieldOffset("button13");
+       eval_button14 = PRVM_ED_FindFieldOffset("button14");
+       eval_button15 = PRVM_ED_FindFieldOffset("button15");
+       eval_button16 = PRVM_ED_FindFieldOffset("button16");
+       eval_buttonuse = PRVM_ED_FindFieldOffset("buttonuse");
+       eval_buttonchat = PRVM_ED_FindFieldOffset("buttonchat");
+       eval_glow_size = PRVM_ED_FindFieldOffset("glow_size");
+       eval_glow_trail = PRVM_ED_FindFieldOffset("glow_trail");
+       eval_glow_color = PRVM_ED_FindFieldOffset("glow_color");
+       eval_items2 = PRVM_ED_FindFieldOffset("items2");
+       eval_scale = PRVM_ED_FindFieldOffset("scale");
+       eval_alpha = PRVM_ED_FindFieldOffset("alpha");
+       eval_renderamt = PRVM_ED_FindFieldOffset("renderamt"); // HalfLife support
+       eval_rendermode = PRVM_ED_FindFieldOffset("rendermode"); // HalfLife support
+       eval_fullbright = PRVM_ED_FindFieldOffset("fullbright");
+       eval_ammo_shells1 = PRVM_ED_FindFieldOffset("ammo_shells1");
+       eval_ammo_nails1 = PRVM_ED_FindFieldOffset("ammo_nails1");
+       eval_ammo_lava_nails = PRVM_ED_FindFieldOffset("ammo_lava_nails");
+       eval_ammo_rockets1 = PRVM_ED_FindFieldOffset("ammo_rockets1");
+       eval_ammo_multi_rockets = PRVM_ED_FindFieldOffset("ammo_multi_rockets");
+       eval_ammo_cells1 = PRVM_ED_FindFieldOffset("ammo_cells1");
+       eval_ammo_plasma = PRVM_ED_FindFieldOffset("ammo_plasma");
+       eval_idealpitch = PRVM_ED_FindFieldOffset("idealpitch");
+       eval_pitch_speed = PRVM_ED_FindFieldOffset("pitch_speed");
+       eval_viewmodelforclient = PRVM_ED_FindFieldOffset("viewmodelforclient");
+       eval_nodrawtoclient = PRVM_ED_FindFieldOffset("nodrawtoclient");
+       eval_exteriormodeltoclient = PRVM_ED_FindFieldOffset("exteriormodeltoclient");
+       eval_drawonlytoclient = PRVM_ED_FindFieldOffset("drawonlytoclient");
+       eval_ping = PRVM_ED_FindFieldOffset("ping");
+       eval_movement = PRVM_ED_FindFieldOffset("movement");
+       eval_pmodel = PRVM_ED_FindFieldOffset("pmodel");
+       eval_punchvector = PRVM_ED_FindFieldOffset("punchvector");
+       eval_viewzoom = PRVM_ED_FindFieldOffset("viewzoom");
+       eval_clientcolors = PRVM_ED_FindFieldOffset("clientcolors");
+       eval_tag_entity = PRVM_ED_FindFieldOffset("tag_entity");
+       eval_tag_index = PRVM_ED_FindFieldOffset("tag_index");
+       eval_light_lev = PRVM_ED_FindFieldOffset("light_lev");
+       eval_color = PRVM_ED_FindFieldOffset("color");
+       eval_style = PRVM_ED_FindFieldOffset("style");
+       eval_pflags = PRVM_ED_FindFieldOffset("pflags");
+       eval_cursor_active = PRVM_ED_FindFieldOffset("cursor_active");
+       eval_cursor_screen = PRVM_ED_FindFieldOffset("cursor_screen");
+       eval_cursor_trace_start = PRVM_ED_FindFieldOffset("cursor_trace_start");
+       eval_cursor_trace_endpos = PRVM_ED_FindFieldOffset("cursor_trace_endpos");
+       eval_cursor_trace_ent = PRVM_ED_FindFieldOffset("cursor_trace_ent");
+       eval_colormod = PRVM_ED_FindFieldOffset("colormod");
+       eval_playermodel = PRVM_ED_FindFieldOffset("playermodel");
+       eval_playerskin = PRVM_ED_FindFieldOffset("playerskin");
+       eval_SendEntity = PRVM_ED_FindFieldOffset("SendEntity");
+       eval_Version = PRVM_ED_FindFieldOffset("Version");
+       eval_customizeentityforclient = PRVM_ED_FindFieldOffset("customizeentityforclient");
+       eval_dphitcontentsmask = PRVM_ED_FindFieldOffset("dphitcontentsmask");
+
+       // LordHavoc: allowing QuakeC to override the player movement code
+       SV_PlayerPhysicsQC = PRVM_ED_FindFunction ("SV_PlayerPhysics");
+       // LordHavoc: support for endframe
+       EndFrameQC = PRVM_ED_FindFunction ("EndFrame");
+       //KrimZon - SERVER COMMANDS IN QUAKEC
+       SV_ParseClientCommandQC = PRVM_ED_FindFunction ("SV_ParseClientCommand");
+
+       //[515]: init stufftext string (it is sent before svc_serverinfo)
+       if(PRVM_ED_FindGlobal("SV_InitCmd") && PRVM_ED_FindGlobal("SV_InitCmd")->type & ev_string)
+               SV_InitCmd = PRVM_G_STRING(PRVM_ED_FindGlobal("SV_InitCmd")->ofs);
+       else
+               SV_InitCmd = NULL;
+
+       gval_trace_dpstartcontents = PRVM_ED_FindGlobalOffset("trace_dpstartcontents");
+       gval_trace_dphitcontents = PRVM_ED_FindGlobalOffset("trace_dphitcontents");
+       gval_trace_dphitq3surfaceflags = PRVM_ED_FindGlobalOffset("trace_dphitq3surfaceflags");
+       gval_trace_dphittexturename = PRVM_ED_FindGlobalOffset("trace_dphittexturename");
+}
+
+#define REQFIELDS (sizeof(reqfields) / sizeof(prvm_required_field_t))
+
+prvm_required_field_t reqfields[] =
+{
+       {ev_entity, "cursor_trace_ent"},
+       {ev_entity, "drawonlytoclient"},
+       {ev_entity, "exteriormodeltoclient"},
+       {ev_entity, "nodrawtoclient"},
+       {ev_entity, "tag_entity"},
+       {ev_entity, "viewmodelforclient"},
+       {ev_float, "alpha"},
+       {ev_float, "ammo_cells1"},
+       {ev_float, "ammo_lava_nails"},
+       {ev_float, "ammo_multi_rockets"},
+       {ev_float, "ammo_nails1"},
+       {ev_float, "ammo_plasma"},
+       {ev_float, "ammo_rockets1"},
+       {ev_float, "ammo_shells1"},
+       {ev_float, "button3"},
+       {ev_float, "button4"},
+       {ev_float, "button5"},
+       {ev_float, "button6"},
+       {ev_float, "button7"},
+       {ev_float, "button8"},
+       {ev_float, "button9"},
+       {ev_float, "button10"},
+       {ev_float, "button11"},
+       {ev_float, "button12"},
+       {ev_float, "button13"},
+       {ev_float, "button14"},
+       {ev_float, "button15"},
+       {ev_float, "button16"},
+       {ev_float, "buttonchat"},
+       {ev_float, "buttonuse"},
+       {ev_float, "clientcolors"},
+       {ev_float, "cursor_active"},
+       {ev_float, "fullbright"},
+       {ev_float, "glow_color"},
+       {ev_float, "glow_size"},
+       {ev_float, "glow_trail"},
+       {ev_float, "gravity"},
+       {ev_float, "idealpitch"},
+       {ev_float, "items2"},
+       {ev_float, "light_lev"},
+       {ev_float, "pflags"},
+       {ev_float, "ping"},
+       {ev_float, "pitch_speed"},
+       {ev_float, "pmodel"},
+       {ev_float, "renderamt"}, // HalfLife support
+       {ev_float, "rendermode"}, // HalfLife support
+       {ev_float, "scale"},
+       {ev_float, "style"},
+       {ev_float, "tag_index"},
+       {ev_float, "Version"},
+       {ev_float, "viewzoom"},
+       {ev_vector, "color"},
+       {ev_vector, "colormod"},
+       {ev_vector, "cursor_screen"},
+       {ev_vector, "cursor_trace_endpos"},
+       {ev_vector, "cursor_trace_start"},
+       {ev_vector, "movement"},
+       {ev_vector, "punchvector"},
+       {ev_string, "playermodel"},
+       {ev_string, "playerskin"},
+       {ev_function, "SendEntity"},
+       {ev_function, "customizeentityforclient"},
+};
+
+void SV_VM_Setup(void)
+{
+       PRVM_Begin;
+       PRVM_InitProg( PRVM_SERVERPROG );
+
+       // allocate the mempools
+       prog->progs_mempool = Mem_AllocPool("Server Progs", 0, NULL);
+       prog->builtins = vm_sv_builtins;
+       prog->numbuiltins = vm_sv_numbuiltins;
+       prog->headercrc = PROGHEADER_CRC;
+       prog->max_edicts = 512;
+       prog->limit_edicts = MAX_EDICTS;
+       prog->reserved_edicts = svs.maxclients;
+       prog->edictprivate_size = sizeof(edict_engineprivate_t);
+       prog->name = "server";
+       prog->extensionstring = vm_sv_extensions;
+       prog->loadintoworld = true;
+
+       prog->begin_increase_edicts = SV_VM_CB_BeginIncreaseEdicts;
+       prog->end_increase_edicts = SV_VM_CB_EndIncreaseEdicts;
+       prog->init_edict = SV_VM_CB_InitEdict;
+       prog->free_edict = SV_VM_CB_FreeEdict;
+       prog->count_edicts = SV_VM_CB_CountEdicts;
+       prog->load_edict = SV_VM_CB_LoadEdict;
+       prog->init_cmd = VM_SV_Cmd_Init;
+       prog->reset_cmd = VM_SV_Cmd_Reset;
+       prog->error_cmd = Host_Error;
+
+       // TODO: add a requiredfuncs list (ask LH if this is necessary at all)
+       PRVM_LoadProgs( sv_progs.string, 0, NULL, REQFIELDS, reqfields );
+       SV_VM_FindEdictFieldOffsets();
+
+       VM_AutoSentStats_Clear();//[515]: csqc
+       EntityFrameCSQC_ClearVersions();//[515]: csqc
+
+       PRVM_End;
+}
+
+void SV_VM_Begin(void)
+{
+       PRVM_Begin;
+       PRVM_SetProg( PRVM_SERVERPROG );
+
+       *prog->time = (float) sv.time;
+}
+
+void SV_VM_End(void)
+{
+       PRVM_End;
 }