]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - sv_main.c
renamed varray_ arrays to rsurface_array_, and they are no longer used outside the...
[xonotic/darkplaces.git] / sv_main.c
index 48c3b912b25af65f50a4de3f6ee8a2fc5d8e74e4..e6ce99427d03c790e71ed34a86d703bc1895b13e 100644 (file)
--- a/sv_main.c
+++ b/sv_main.c
@@ -21,30 +21,41 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "quakedef.h"
 
-// select which protocol to host, by name
-// this is named the same as PROTOCOL_DARKPLACES6 for example, minus the PROTOCOL_ prefix
-cvar_t sv_protocolname = {0, "sv_protocolname", "DARKPLACES6"};
-cvar_t sv_ratelimitlocalplayer = {0, "sv_ratelimitlocalplayer", "0"};
-cvar_t sv_maxrate = {CVAR_SAVE | CVAR_NOTIFY, "sv_maxrate", "10000"};
-
-static cvar_t sv_cullentities_pvs = {0, "sv_cullentities_pvs", "1"}; // fast but loose
-static cvar_t sv_cullentities_trace = {0, "sv_cullentities_trace", "0"}; // 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"};
-static cvar_t sv_entpatch = {0, "sv_entpatch", "1"};
-
-extern cvar_t sys_ticrate;
-
-cvar_t sv_gameplayfix_grenadebouncedownslopes = {0, "sv_gameplayfix_grenadebouncedownslopes", "1"};
-cvar_t sv_gameplayfix_noairborncorpse = {0, "sv_gameplayfix_noairborncorpse", "1"};
-cvar_t sv_gameplayfix_stepdown = {0, "sv_gameplayfix_stepdown", "1"};
-cvar_t sv_gameplayfix_stepwhilejumping = {0, "sv_gameplayfix_stepwhilejumping", "1"};
-cvar_t sv_gameplayfix_swiminbmodels = {0, "sv_gameplayfix_swiminbmodels", "1"};
-cvar_t sv_gameplayfix_setmodelrealbox = {0, "sv_gameplayfix_setmodelrealbox", "1"};
+void SV_VM_Init();
+void SV_VM_Setup();
+
+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", "1", "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_progs = {0, "sv_progs", "progs.dat", "selects which quakec progs.dat file to run" };
 
 server_t sv;
 server_static_t svs;
 
-mempool_t *sv_edicts_mempool = NULL;
+mempool_t *sv_mempool = NULL;
 
 //============================================================================
 
@@ -59,18 +70,18 @@ SV_Init
 */
 void SV_Init (void)
 {
-       Cmd_AddCommand("sv_saveentfile", SV_SaveEntFile_f);
+       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_edgefriction);
        Cvar_RegisterVariable (&sv_stopspeed);
        Cvar_RegisterVariable (&sv_maxspeed);
+       Cvar_RegisterVariable (&sv_maxairspeed);
        Cvar_RegisterVariable (&sv_accelerate);
        Cvar_RegisterVariable (&sv_idealpitchscale);
        Cvar_RegisterVariable (&sv_aim);
        Cvar_RegisterVariable (&sv_nostep);
-       Cvar_RegisterVariable (&sv_deltacompress);
        Cvar_RegisterVariable (&sv_cullentities_pvs);
        Cvar_RegisterVariable (&sv_cullentities_trace);
        Cvar_RegisterVariable (&sv_cullentities_stats);
@@ -81,14 +92,18 @@ void SV_Init (void)
        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_protocolname);
        Cvar_RegisterVariable (&sv_ratelimitlocalplayer);
        Cvar_RegisterVariable (&sv_maxrate);
+       Cvar_RegisterVariable (&sv_progs);
 
+       SV_VM_Init();
        SV_Phys_Init();
        SV_World_Init();
 
-       sv_edicts_mempool = Mem_AllocPool("server edicts", 0, NULL);
+       sv_mempool = Mem_AllocPool("server", 0, NULL);
 }
 
 static void SV_SaveEntFile_f(void)
@@ -100,7 +115,7 @@ static void SV_SaveEntFile_f(void)
                return;
        }
        FS_StripExtension(sv.worldmodel->name, basename, sizeof(basename));
-       FS_WriteFile(va("%s.ent", basename), sv.worldmodel->brush.entities, strlen(sv.worldmodel->brush.entities));
+       FS_WriteFile(va("%s.ent", basename), sv.worldmodel->brush.entities, (fs_offset_t)strlen(sv.worldmodel->brush.entities));
 }
 
 
@@ -194,18 +209,27 @@ Larger attenuations will drop off.  (max 4 attenuation)
 
 ==================
 */
-void SV_StartSound (edict_t *entity, int channel, char *sample, int volume, float attenuation)
+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_PACKETFRAGMENT-21)
                return;
@@ -215,7 +239,7 @@ void SV_StartSound (edict_t *entity, int channel, char *sample, int volume, floa
        if (!sound_num)
                return;
 
-       ent = NUM_FOR_EDICT(entity);
+       ent = PRVM_NUM_FOR_EDICT(entity);
 
        field_mask = 0;
        if (volume != DEFAULT_SOUND_PACKET_VOLUME)
@@ -246,7 +270,7 @@ void SV_StartSound (edict_t *entity, int channel, char *sample, int volume, floa
        else
                MSG_WriteByte (&sv.datagram, sound_num);
        for (i = 0;i < 3;i++)
-               MSG_WriteCoord (&sv.datagram, entity->v->origin[i]+0.5*(entity->v->mins[i]+entity->v->maxs[i]), sv.protocol);
+               MSG_WriteCoord (&sv.datagram, entity->fields.server->origin[i]+0.5*(entity->fields.server->mins[i]+entity->fields.server->maxs[i]), sv.protocol);
 }
 
 /*
@@ -257,6 +281,8 @@ CLIENT SPAWNING
 ==============================================================================
 */
 
+static const char *SV_InitCmd; //[515]: svprogs able to send cmd to client on connect
+extern qboolean csqc_loaded;
 /*
 ================
 SV_SendServerinfo
@@ -270,28 +296,14 @@ void SV_SendServerinfo (client_t *client)
        int i;
        char message[128];
 
+       // we know that this client has a netconnection and thus is not a bot
+
        // edicts get reallocated on level changes, so we need to update it here
-       client->edict = EDICT_NUM((client - svs.clients) + 1);
+       client->edict = PRVM_EDICT_NUM((client - svs.clients) + 1);
 
-       // if client is a botclient coming from a level change, we need to set up
-       // client info that normally requires networking
-       if (!client->netconnection)
-       {
-               // set up the edict
-               ED_ClearEdict(client->edict);
-
-               // copy spawn parms out of the client_t
-               for (i=0 ; i< NUM_SPAWN_PARMS ; i++)
-                       (&pr_global_struct->parm1)[i] = host_client->spawn_parms[i];
-
-               // call the spawn function
-               pr_global_struct->time = sv.time;
-               pr_global_struct->self = EDICT_TO_PROG(client->edict);
-               PR_ExecuteProgram (pr_global_struct->ClientConnect, "QC function ClientConnect is missing");
-               PR_ExecuteProgram (pr_global_struct->PutClientInServer, "QC function PutClientInServer is missing");
-               host_client->spawned = true;
-               return;
-       }
+       // clear cached stuff that depends on the level
+       client->weaponmodel[0] = 0;
+       client->weaponmodelindex = 0;
 
        // LordHavoc: clear entityframe tracking
        client->latestframenum = 0;
@@ -303,49 +315,63 @@ void SV_SendServerinfo (client_t *client)
        if (client->entitydatabase5)
                EntityFrame5_FreeDatabase(client->entitydatabase5);
 
-       if (sv.protocol == PROTOCOL_DARKPLACES1 || sv.protocol == PROTOCOL_DARKPLACES2 || sv.protocol == PROTOCOL_DARKPLACES3)
-               client->entitydatabase = EntityFrame_AllocDatabase(sv_clients_mempool);
-       if (sv.protocol == PROTOCOL_DARKPLACES4)
-               client->entitydatabase4 = EntityFrame4_AllocDatabase(sv_clients_mempool);
-       if (sv.protocol == PROTOCOL_DARKPLACES5 || sv.protocol == PROTOCOL_DARKPLACES6)
-               client->entitydatabase5 = EntityFrame5_AllocDatabase(sv_clients_mempool);
+       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);
+       }
 
-       MSG_WriteByte (&client->message, svc_print);
-       snprintf (message, sizeof (message), "\002\nServer: %s build %s (progs %i crc)", gamename, buildstring, pr_crc);
-       MSG_WriteString (&client->message,message);
+       SZ_Clear (&client->netconnection->message);
+       MSG_WriteByte (&client->netconnection->message, svc_print);
+       dpsnprintf (message, sizeof (message), "\002\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->message, svc_serverinfo);
-       MSG_WriteLong (&client->message, sv.protocol);
-       MSG_WriteByte (&client->message, svs.maxclients);
+       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->message, GAME_DEATHMATCH);
+               MSG_WriteByte (&client->netconnection->message, GAME_DEATHMATCH);
        else
-               MSG_WriteByte (&client->message, GAME_COOP);
+               MSG_WriteByte (&client->netconnection->message, GAME_COOP);
 
-       MSG_WriteString (&client->message,PR_GetString(sv.edicts->v->message));
+       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->message, sv.model_precache[i]);
-       MSG_WriteByte (&client->message, 0);
+               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->message, sv.sound_precache[i]);
-       MSG_WriteByte (&client->message, 0);
+               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, prog->edicts->fields.server->sounds);
+       MSG_WriteByte (&client->netconnection->message, prog->edicts->fields.server->sounds);
 
 // set view
-       MSG_WriteByte (&client->message, svc_setview);
-       MSG_WriteShort (&client->message, NUM_FOR_EDICT(client->edict));
+       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
 }
 
@@ -365,6 +391,9 @@ void SV_ConnectClient (int clientnum, netconn_t *netconnection)
 
        client = svs.clients + clientnum;
 
+       if(netconnection)//[515]: bots don't play with csqc =)
+               EntityFrameCSQC_InitClientVersions(clientnum, false);
+
 // set up the client_t
        if (sv.loadgame)
                memcpy (spawn_parms, client->spawn_parms, sizeof(spawn_parms));
@@ -377,10 +406,9 @@ void SV_ConnectClient (int clientnum, netconn_t *netconnection)
        strcpy(client->name, "unconnected");
        strcpy(client->old_name, "unconnected");
        client->spawned = false;
-       client->edict = EDICT_NUM(clientnum+1);
-       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
@@ -393,9 +421,14 @@ void SV_ConnectClient (int clientnum, netconn_t *netconnection)
        else
        {
                // call the progs to get default spawn parms for the new client
-               PR_ExecuteProgram (pr_global_struct->SetNewParms, "QC function SetNewParms is missing");
+               // 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];
+
+               // 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
@@ -438,160 +471,258 @@ crosses a waterline.
 */
 
 int sv_writeentitiestoclient_pvsbytes;
-qbyte sv_writeentitiestoclient_pvs[MAX_MAP_LEAFS/8];
+unsigned char sv_writeentitiestoclient_pvs[MAX_MAP_LEAFS/8];
 
 static int numsendentities;
 static entity_state_t sendentities[MAX_EDICTS];
 static entity_state_t *sendentitiesindex[MAX_EDICTS];
 
-void SV_PrepareEntitiesForSending(void)
+qboolean SV_PrepareEntityForSending (prvm_edict_t *ent, entity_state_t *cs, int e)
 {
-       int e, i;
+       int i;
+       unsigned int modelindex, effects, flags, glowsize, lightstyle, lightpflags, light[4], specialvisibilityradius;
+       unsigned int customizeentityforclient;
        float f;
-       edict_t *ent;
-       entity_state_t cs;
-       // send all entities that touch the pvs
-       numsendentities = 0;
-       sendentitiesindex[0] = NULL;
-       for (e = 1, ent = NEXT_EDICT(sv.edicts);e < sv.num_edicts;e++, ent = NEXT_EDICT(ent))
+       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)
        {
-               sendentitiesindex[e] = NULL;
-               if (ent->e->free)
-                       continue;
-
-               cs = defaultstate;
-               cs.active = true;
-               cs.number = e;
-               VectorCopy(ent->v->origin, cs.origin);
-               VectorCopy(ent->v->angles, cs.angles);
-               cs.flags = 0;
-               cs.effects = (int)ent->v->effects;
-               cs.colormap = (qbyte)ent->v->colormap;
-               cs.skin = (qbyte)ent->v->skin;
-               cs.frame = (qbyte)ent->v->frame;
-               cs.viewmodelforclient = GETEDICTFIELDVALUE(ent, eval_viewmodelforclient)->edict;
-               cs.exteriormodelforclient = GETEDICTFIELDVALUE(ent, eval_exteriormodeltoclient)->edict;
-               cs.nodrawtoclient = GETEDICTFIELDVALUE(ent, eval_nodrawtoclient)->edict;
-               cs.drawonlytoclient = GETEDICTFIELDVALUE(ent, eval_drawonlytoclient)->edict;
-               cs.tagentity = GETEDICTFIELDVALUE(ent, eval_tag_entity)->edict;
-               cs.tagindex = (qbyte)GETEDICTFIELDVALUE(ent, eval_tag_index)->_float;
-               i = (int)(GETEDICTFIELDVALUE(ent, eval_glow_size)->_float * 0.25f);
-               cs.glowsize = (qbyte)bound(0, i, 255);
-               if (GETEDICTFIELDVALUE(ent, eval_glow_trail)->_float)
-                       cs.flags |= RENDER_GLOWTRAIL;
-
-               cs.modelindex = 0;
-               i = (int)ent->v->modelindex;
-               if (i >= 1 && i < MAX_MODELS && *PR_GetString(ent->v->model))
-                       cs.modelindex = i;
-
-               cs.alpha = 255;
-               f = (GETEDICTFIELDVALUE(ent, eval_alpha)->_float * 255.0f);
-               if (f)
+               // tenebrae's EF_FULLDYNAMIC conflicts with Q2's EF_NODRAW
+               if (effects & 16)
                {
-                       i = (int)f;
-                       cs.alpha = (qbyte)bound(0, i, 255);
+                       effects &= ~16;
+                       lightpflags |= PFLAGS_FULLDYNAMIC;
                }
-               // halflife
-               f = (GETEDICTFIELDVALUE(ent, eval_renderamt)->_float);
-               if (f)
+               // tenebrae's EF_GREEN conflicts with DP's EF_ADDITIVE
+               if (effects & 32)
                {
-                       i = (int)f;
-                       cs.alpha = (qbyte)bound(0, i, 255);
+                       effects &= ~32;
+                       light[0] = 0.2;
+                       light[1] = 1;
+                       light[2] = 0.2;
+                       light[3] = 200;
+                       lightpflags |= PFLAGS_FULLDYNAMIC;
                }
+       }
 
-               cs.scale = 16;
-               f = (GETEDICTFIELDVALUE(ent, eval_scale)->_float * 16.0f);
-               if (f)
+       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);
+       }
+
+       // 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 = val->vector[0] * 32.0f;cs->colormod[0] = bound(0, i, 255);
+               i = val->vector[1] * 32.0f;cs->colormod[1] = bound(0, i, 255);
+               i = val->vector[2] * 32.0f;cs->colormod[2] = bound(0, i, 255);
+       }
+
+       cs->modelindex = modelindex;
+
+       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);
+       }
+
+       cs->scale = 16;
+       f = (PRVM_GETEDICTFIELDVALUE(ent, eval_scale)->_float * 16.0f);
+       if (f)
+       {
+               i = (int)f;
+               cs->scale = (unsigned char)bound(0, i, 255);
+       }
+
+       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]))
+       {
+               float scale = cs->scale * (1.0f / 16.0f);
+               if (cs->angles[0] || cs->angles[2]) // pitch and roll
                {
-                       i = (int)f;
-                       cs.scale = (qbyte)bound(0, i, 255);
+                       VectorMA(cs->origin, scale, model->rotatedmins, cullmins);
+                       VectorMA(cs->origin, scale, model->rotatedmaxs, cullmaxs);
                }
-
-               cs.glowcolor = 254;
-               f = (GETEDICTFIELDVALUE(ent, eval_glow_color)->_float);
-               if (f)
-                       cs.glowcolor = (int)f;
-
-               if (GETEDICTFIELDVALUE(ent, eval_fullbright)->_float)
-                       cs.effects |= EF_FULLBRIGHT;
-
-               if (ent->v->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->v->colormap >= 1024)
-                       cs.flags |= RENDER_COLORMAPPED;
-               if (cs.viewmodelforclient)
-                       cs.flags |= RENDER_VIEWMODEL; // show relative to the view
-
-               f = GETEDICTFIELDVALUE(ent, eval_color)->vector[0]*256;
-               cs.light[0] = (unsigned short)bound(0, f, 65535);
-               f = GETEDICTFIELDVALUE(ent, eval_color)->vector[1]*256;
-               cs.light[1] = (unsigned short)bound(0, f, 65535);
-               f = GETEDICTFIELDVALUE(ent, eval_color)->vector[2]*256;
-               cs.light[2] = (unsigned short)bound(0, f, 65535);
-               f = GETEDICTFIELDVALUE(ent, eval_light_lev)->_float;
-               cs.light[3] = (unsigned short)bound(0, f, 65535);
-               cs.lightstyle = (qbyte)GETEDICTFIELDVALUE(ent, eval_style)->_float;
-               cs.lightpflags = (qbyte)GETEDICTFIELDVALUE(ent, eval_pflags)->_float;
-
-               if (gamemode == GAME_TENEBRAE)
+               else if (cs->angles[1])
                {
-                       // tenebrae's EF_FULLDYNAMIC conflicts with Q2's EF_NODRAW
-                       if (cs.effects & 16)
-                       {
-                               cs.effects &= ~16;
-                               cs.lightpflags |= PFLAGS_FULLDYNAMIC;
-                       }
-                       // tenebrae's EF_GREEN conflicts with DP's EF_ADDITIVE
-                       if (cs.effects & 32)
-                       {
-                               cs.effects &= ~32;
-                               cs.light[0] = 0.2;
-                               cs.light[1] = 1;
-                               cs.light[2] = 0.2;
-                               cs.light[3] = 200;
-                               cs.lightpflags |= PFLAGS_FULLDYNAMIC;
-                       }
+                       VectorMA(cs->origin, scale, model->yawmins, cullmins);
+                       VectorMA(cs->origin, scale, model->yawmaxs, cullmaxs);
                }
-
-               cs.specialvisibilityradius = 0;
-               if (cs.lightpflags & PFLAGS_FULLDYNAMIC)
-                       cs.specialvisibilityradius = max(cs.specialvisibilityradius, cs.light[3]);
-               if (cs.glowsize)
-                       cs.specialvisibilityradius = max(cs.specialvisibilityradius, cs.glowsize * 4);
-               if (cs.flags & RENDER_GLOWTRAIL)
-                       cs.specialvisibilityradius = max(cs.specialvisibilityradius, 100);
-               if (cs.effects & (EF_BRIGHTFIELD | EF_MUZZLEFLASH | EF_BRIGHTLIGHT | EF_DIMLIGHT | EF_RED | EF_BLUE | EF_FLAME | EF_STARDUST))
+               else
                {
-                       if (cs.effects & EF_BRIGHTFIELD)
-                               cs.specialvisibilityradius = max(cs.specialvisibilityradius, 80);
-                       if (cs.effects & EF_MUZZLEFLASH)
-                               cs.specialvisibilityradius = max(cs.specialvisibilityradius, 100);
-                       if (cs.effects & EF_BRIGHTLIGHT)
-                               cs.specialvisibilityradius = max(cs.specialvisibilityradius, 400);
-                       if (cs.effects & EF_DIMLIGHT)
-                               cs.specialvisibilityradius = max(cs.specialvisibilityradius, 200);
-                       if (cs.effects & EF_RED)
-                               cs.specialvisibilityradius = max(cs.specialvisibilityradius, 200);
-                       if (cs.effects & EF_BLUE)
-                               cs.specialvisibilityradius = max(cs.specialvisibilityradius, 200);
-                       if (cs.effects & EF_FLAME)
-                               cs.specialvisibilityradius = max(cs.specialvisibilityradius, 250);
-                       if (cs.effects & EF_STARDUST)
-                               cs.specialvisibilityradius = max(cs.specialvisibilityradius, 100);
+                       VectorMA(cs->origin, scale, model->normalmins, cullmins);
+                       VectorMA(cs->origin, scale, model->normalmaxs, cullmaxs);
                }
+       }
+       else
+       {
+               VectorCopy(cs->origin, cullmins);
+               VectorCopy(cs->origin, 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;
+               }
+       }
 
-               if (numsendentities >= MAX_EDICTS)
-                       continue;
-               // 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
-               if (cs.number > svs.maxclients && ((cs.effects & EF_NODRAW) || (!cs.modelindex && !cs.specialvisibilityradius)))
-                       continue;
-               sendentitiesindex[e] = sendentities + numsendentities;
-               sendentities[numsendentities++] = cs;
+       return true;
+}
+
+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))
+               {
+                       sendentitiesindex[e] = sendentities + numsendentities;
+                       numsendentities++;
+               }
        }
 }
 
@@ -610,20 +741,26 @@ static client_t *sv_writeentitiestoclient_client;
 void SV_MarkWriteEntityStateToClient(entity_state_t *s)
 {
        int isbmodel;
-       vec3_t entmins, entmaxs, lightmins, lightmaxs, testorigin;
+       vec3_t testorigin;
        model_t *model;
+       prvm_edict_t *ed;
        trace_t trace;
        if (sententitiesconsideration[s->number] == sententitiesmark)
                return;
        sententitiesconsideration[s->number] = sententitiesmark;
-       // viewmodels don't have visibility checking
-       if (s->viewmodelforclient)
+       sv_writeentitiestoclient_totalentities++;
+
+       if (s->customizeentityforclient)
        {
-               if (s->viewmodelforclient != sv_writeentitiestoclient_clentnum)
+               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
-       else if (s->number != sv_writeentitiestoclient_clentnum)
+       if (s->number != sv_writeentitiestoclient_clentnum)
        {
                // check various rejection conditions
                if (s->nodrawtoclient == sv_writeentitiestoclient_clentnum)
@@ -635,7 +772,14 @@ void SV_MarkWriteEntityStateToClient(entity_state_t *s)
                // LordHavoc: only send entities with a model or important effects
                if (!s->modelindex && s->specialvisibilityradius == 0)
                        return;
-               if (s->tagentity)
+
+               // viewmodels don't have visibility checking
+               if (s->viewmodelforclient)
+               {
+                       if (s->viewmodelforclient != sv_writeentitiestoclient_clentnum)
+                               return;
+               }
+               else if (s->tagentity)
                {
                        // tag attached entities simply check their parent
                        if (!sendentitiesindex[s->tagentity])
@@ -644,85 +788,69 @@ void SV_MarkWriteEntityStateToClient(entity_state_t *s)
                        if (sententities[s->tagentity] != sententitiesmark)
                                return;
                }
-               // skip invalid modelindexes to avoid crashes
-               else if (s->modelindex >= MAX_MODELS)
-                       return;
-               // always send world submodels, they don't generate much traffic
-               // except in PROTOCOL_QUAKE where they hog bandwidth like crazy
-               else if (!(s->effects & EF_NODEPTHTEST) && (!(isbmodel = (model = sv.models[s->modelindex]) != NULL && model->name[0] == '*') || sv.protocol == PROTOCOL_QUAKE))
+               // 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)))
                {
-                       Mod_CheckLoaded(model);
                        // entity has survived every check so far, check if visible
-                       // enlarged box to account for prediction (not that there is
-                       // any currently, but still helps the 'run into a room and
-                       // watch items pop up' problem)
-                       entmins[0] = s->origin[0] - 32.0f;
-                       entmins[1] = s->origin[1] - 32.0f;
-                       entmins[2] = s->origin[2] - 32.0f;
-                       entmaxs[0] = s->origin[0] + 32.0f;
-                       entmaxs[1] = s->origin[1] + 32.0f;
-                       entmaxs[2] = s->origin[2] + 32.0f;
-                       // using the model's bounding box to ensure things are visible regardless of their physics box
-                       if (model)
+                       ed = PRVM_EDICT_NUM(s->number);
+
+                       // if not touching a visible leaf
+                       if (sv_cullentities_pvs.integer && sv_writeentitiestoclient_pvsbytes)
                        {
-                               if (s->angles[0] || s->angles[2]) // pitch and roll
+                               if (ed->priv.server->pvs_numclusters < 0)
                                {
-                                       VectorAdd(entmins, model->rotatedmins, entmins);
-                                       VectorAdd(entmaxs, model->rotatedmaxs, entmaxs);
-                               }
-                               else if (s->angles[1])
-                               {
-                                       VectorAdd(entmins, model->yawmins, entmins);
-                                       VectorAdd(entmaxs, model->yawmaxs, entmaxs);
+                                       // 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
                                {
-                                       VectorAdd(entmins, model->normalmins, entmins);
-                                       VectorAdd(entmaxs, model->normalmaxs, entmaxs);
+                                       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;
+                                       }
                                }
                        }
-                       lightmins[0] = min(entmins[0], s->origin[0] - s->specialvisibilityradius);
-                       lightmins[1] = min(entmins[1], s->origin[1] - s->specialvisibilityradius);
-                       lightmins[2] = min(entmins[2], s->origin[2] - s->specialvisibilityradius);
-                       lightmaxs[0] = max(entmaxs[0], s->origin[0] + s->specialvisibilityradius);
-                       lightmaxs[1] = max(entmaxs[1], s->origin[1] + s->specialvisibilityradius);
-                       lightmaxs[2] = max(entmaxs[2], s->origin[2] + s->specialvisibilityradius);
-                       sv_writeentitiestoclient_totalentities++;
-                       // if not touching a visible leaf
-                       if (sv_cullentities_pvs.integer && sv_writeentitiestoclient_pvsbytes && sv.worldmodel && sv.worldmodel->brush.BoxTouchingPVS && !sv.worldmodel->brush.BoxTouchingPVS(sv.worldmodel, sv_writeentitiestoclient_pvs, lightmins, lightmaxs))
-                       {
-                               sv_writeentitiestoclient_culled_pvs++;
-                               return;
-                       }
+
                        // or not seen by random tracelines
                        if (sv_cullentities_trace.integer && !isbmodel)
                        {
                                // LordHavoc: test center first
-                               testorigin[0] = (entmins[0] + entmaxs[0]) * 0.5f;
-                               testorigin[1] = (entmins[1] + entmaxs[1]) * 0.5f;
-                               testorigin[2] = (entmins[2] + entmaxs[2]) * 0.5f;
+                               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, sv_writeentitiestoclient_testeye, testorigin, testorigin, SUPERCONTENTS_SOLID);
-                               if (trace.fraction == 1 || BoxesOverlap(trace.endpos, trace.endpos, entmins, entmaxs))
+                               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(entmins[0], entmaxs[0]);
-                                       testorigin[1] = lhrandom(entmins[1], entmaxs[1]);
-                                       testorigin[2] = lhrandom(entmins[2], entmaxs[2]);
+                                       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, sv_writeentitiestoclient_testeye, testorigin, testorigin, SUPERCONTENTS_SOLID);
-                                       if (trace.fraction == 1 || BoxesOverlap(trace.endpos, trace.endpos, entmins, entmaxs))
+                                       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(lightmins[0], lightmaxs[0]);
-                                                       testorigin[1] = lhrandom(lightmins[1], lightmaxs[1]);
-                                                       testorigin[2] = lhrandom(lightmins[2], lightmaxs[2]);
+                                                       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, sv_writeentitiestoclient_testeye, testorigin, testorigin, SUPERCONTENTS_SOLID);
-                                                       if (trace.fraction == 1 || BoxesOverlap(trace.endpos, trace.endpos, entmins, entmaxs))
+                                                       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;
                                                }
                                        }
@@ -733,18 +861,20 @@ void SV_MarkWriteEntityStateToClient(entity_state_t *s)
                                        return;
                                }
                        }
-                       sv_writeentitiestoclient_visibleentities++;
                }
        }
+
        // 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]; 
+entity_state_t sendstates[MAX_EDICTS];
+extern int csqc_clent;
 
-void SV_WriteEntitiesToClient(client_t *client, edict_t *clent, sizebuf_t *msg, int *stats)
+void SV_WriteEntitiesToClient(client_t *client, prvm_edict_t *clent, sizebuf_t *msg, int *stats)
 {
        int i, numsendstates;
        entity_state_t *s;
@@ -760,16 +890,14 @@ void SV_WriteEntitiesToClient(client_t *client, edict_t *clent, sizebuf_t *msg,
        sv_writeentitiestoclient_visibleentities = 0;
        sv_writeentitiestoclient_totalentities = 0;
 
-       Mod_CheckLoaded(sv.worldmodel);
-
 // find the client's PVS
        // the real place being tested from
-       VectorAdd(clent->v->origin, clent->v->view_ofs, sv_writeentitiestoclient_testeye);
+       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));
 
-       sv_writeentitiestoclient_clentnum = EDICT_TO_PROG(clent); // LordHavoc: for comparison purposes
+       csqc_clent = sv_writeentitiestoclient_clentnum = PRVM_EDICT_TO_PROG(clent); // LordHavoc: for comparison purposes
 
        sententitiesmark++;
 
@@ -791,8 +919,10 @@ void SV_WriteEntitiesToClient(client_t *client, edict_t *clent, sizebuf_t *msg,
        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);
+               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)
@@ -810,11 +940,11 @@ SV_CleanupEnts
 void SV_CleanupEnts (void)
 {
        int             e;
-       edict_t *ent;
+       prvm_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;
+       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;
 }
 
 /*
@@ -823,31 +953,31 @@ SV_WriteClientdataToMessage
 
 ==================
 */
-void SV_WriteClientdataToMessage (client_t *client, edict_t *ent, sizebuf_t *msg, int *stats)
+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;
-       qbyte   viewzoom;
-       int             weaponmodelindex;
+       unsigned char   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, ent->fields.server->dmg_save);
+               MSG_WriteByte (msg, ent->fields.server->dmg_take);
                for (i=0 ; i<3 ; i++)
-                       MSG_WriteCoord (msg, other->v->origin[i] + 0.5*(other->v->mins[i] + other->v->maxs[i]), sv.protocol);
+                       MSG_WriteCoord (msg, other->fields.server->origin[i] + 0.5*(other->fields.server->mins[i] + other->fields.server->maxs[i]), sv.protocol);
 
-               ent->v->dmg_take = 0;
-               ent->v->dmg_save = 0;
+               ent->fields.server->dmg_take = 0;
+               ent->fields.server->dmg_save = 0;
        }
 
 //
@@ -856,76 +986,83 @@ void SV_WriteClientdataToMessage (client_t *client, 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], sv.protocol);
-               ent->v->fixangle = 0;
+                       MSG_WriteAngle (msg, ent->fields.server->angles[i], sv.protocol);
+               ent->fields.server->fixangle = 0;
        }
 
        // stuff the sigil bits into the high bits of items for sbar, or else
        // mix in items2
-       val = GETEDICTFIELDVALUE(ent, eval_items2);
-       if (val)
-               items = (int)ent->v->items | ((int)val->_float << 23);
+       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->v->items | ((int)pr_global_struct->serverflags << 28);
+               items = (int)ent->fields.server->items | ((int)prog->globals.server->serverflags << 28);
 
        VectorClear(punchvector);
-       if ((val = GETEDICTFIELDVALUE(ent, eval_punchvector)))
+       if ((val = PRVM_GETEDICTFIELDVALUE(ent, eval_punchvector)))
                VectorCopy(val->vector, punchvector);
 
-       weaponmodelindex = SV_ModelIndex(PR_GetString(ent->v->weaponmodel), 1);
+       // 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);
+       }
 
        viewzoom = 255;
-       if ((val = GETEDICTFIELDVALUE(ent, eval_viewzoom)))
+       if ((val = PRVM_GETEDICTFIELDVALUE(ent, eval_viewzoom)))
                viewzoom = val->_float * 255.0f;
        if (viewzoom == 0)
                viewzoom = 255;
 
        bits = 0;
 
-       if ((int)ent->v->flags & FL_ONGROUND)
+       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->v->idealpitch)
+       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 (sv.protocol == PROTOCOL_DARKPLACES1 || sv.protocol == PROTOCOL_DARKPLACES2 || sv.protocol == PROTOCOL_DARKPLACES3 || sv.protocol == PROTOCOL_DARKPLACES4 || sv.protocol == PROTOCOL_DARKPLACES5 || sv.protocol == PROTOCOL_DARKPLACES6)
+               if (sv.protocol != PROTOCOL_QUAKE && sv.protocol != PROTOCOL_QUAKEDP && sv.protocol != PROTOCOL_NEHAHRAMOVIE)
                        if (punchvector[i])
                                bits |= (SU_PUNCHVEC1<<i);
-               if (ent->v->velocity[i])
+               if (ent->fields.server->velocity[i])
                        bits |= (SU_VELOCITY1<<i);
        }
 
        memset(stats, 0, sizeof(int[MAX_CL_STATS]));
-       stats[STAT_VIEWHEIGHT] = ent->v->view_ofs[2];
+       stats[STAT_VIEWHEIGHT] = ent->fields.server->view_ofs[2];
        stats[STAT_ITEMS] = items;
-       stats[STAT_WEAPONFRAME] = ent->v->weaponframe;
-       stats[STAT_ARMOR] = ent->v->armorvalue;
-       stats[STAT_WEAPON] = weaponmodelindex;
-       stats[STAT_HEALTH] = ent->v->health;
-       stats[STAT_AMMO] = ent->v->currentammo;
-       stats[STAT_SHELLS] = ent->v->ammo_shells;
-       stats[STAT_NAILS] = ent->v->ammo_nails;
-       stats[STAT_ROCKETS] = ent->v->ammo_rockets;
-       stats[STAT_CELLS] = ent->v->ammo_cells;
-       stats[STAT_ACTIVEWEAPON] = ent->v->weapon;
+       stats[STAT_WEAPONFRAME] = ent->fields.server->weaponframe;
+       stats[STAT_ARMOR] = ent->fields.server->armorvalue;
+       stats[STAT_WEAPON] = client->weaponmodelindex;
+       stats[STAT_HEALTH] = ent->fields.server->health;
+       stats[STAT_AMMO] = ent->fields.server->currentammo;
+       stats[STAT_SHELLS] = ent->fields.server->ammo_shells;
+       stats[STAT_NAILS] = ent->fields.server->ammo_nails;
+       stats[STAT_ROCKETS] = ent->fields.server->ammo_rockets;
+       stats[STAT_CELLS] = ent->fields.server->ammo_cells;
+       stats[STAT_ACTIVEWEAPON] = 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] = pr_global_struct->total_secrets;
-       //stats[STAT_TOTALMONSTERS] = pr_global_struct->total_monsters;
-       //stats[STAT_SECRETS] = pr_global_struct->found_secrets;
-       //stats[STAT_MONSTERS] = pr_global_struct->killed_monsters;
+       //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_DARKPLACES6)
+       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;
@@ -933,7 +1070,7 @@ void SV_WriteClientdataToMessage (client_t *client, edict_t *ent, sizebuf_t *msg
                if (stats[STAT_ARMOR]) bits |= SU_ARMOR;
                bits |= SU_WEAPON;
                // FIXME: which protocols support this?  does PROTOCOL_DARKPLACES3 support viewzoom?
-               if (sv.protocol == PROTOCOL_DARKPLACES4 || sv.protocol == PROTOCOL_DARKPLACES5)
+               if (sv.protocol == PROTOCOL_DARKPLACES2 || sv.protocol == PROTOCOL_DARKPLACES3 || sv.protocol == PROTOCOL_DARKPLACES4 || sv.protocol == PROTOCOL_DARKPLACES5)
                        if (viewzoom != 255)
                                bits |= SU_VIEWZOOM;
        }
@@ -955,33 +1092,30 @@ void SV_WriteClientdataToMessage (client_t *client, edict_t *ent, sizebuf_t *msg
                MSG_WriteChar (msg, stats[STAT_VIEWHEIGHT]);
 
        if (bits & SU_IDEALPITCH)
-               MSG_WriteChar (msg, ent->v->idealpitch);
+               MSG_WriteChar (msg, ent->fields.server->idealpitch);
 
        for (i=0 ; i<3 ; i++)
        {
                if (bits & (SU_PUNCH1<<i))
                {
-                       if (sv.protocol == PROTOCOL_QUAKE)
-                               MSG_WriteChar(msg, ent->v->punchangle[i]);
-                       else if (sv.protocol == PROTOCOL_DARKPLACES1 || sv.protocol == PROTOCOL_DARKPLACES2 || sv.protocol == PROTOCOL_DARKPLACES3 || sv.protocol == PROTOCOL_DARKPLACES4 || sv.protocol == PROTOCOL_DARKPLACES5 || sv.protocol == PROTOCOL_DARKPLACES6)
-                               MSG_WriteAngle16i(msg, ent->v->punchangle[i]);
+                       if (sv.protocol == PROTOCOL_QUAKE || sv.protocol == PROTOCOL_QUAKEDP || sv.protocol == PROTOCOL_NEHAHRAMOVIE)
+                               MSG_WriteChar(msg, ent->fields.server->punchangle[i]);
+                       else
+                               MSG_WriteAngle16i(msg, ent->fields.server->punchangle[i]);
                }
-               if (sv.protocol == PROTOCOL_DARKPLACES1 || sv.protocol == PROTOCOL_DARKPLACES2 || sv.protocol == PROTOCOL_DARKPLACES3 || sv.protocol == PROTOCOL_DARKPLACES4 || sv.protocol == PROTOCOL_DARKPLACES5 || sv.protocol == PROTOCOL_DARKPLACES6)
+               if (bits & (SU_PUNCHVEC1<<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 if (sv.protocol == PROTOCOL_DARKPLACES5 || sv.protocol == PROTOCOL_DARKPLACES6)
-                                       MSG_WriteCoord32f(msg, punchvector[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))
                {
                        if (sv.protocol == PROTOCOL_QUAKE || sv.protocol == PROTOCOL_DARKPLACES1 || sv.protocol == PROTOCOL_DARKPLACES2 || sv.protocol == PROTOCOL_DARKPLACES3 || sv.protocol == PROTOCOL_DARKPLACES4)
-                               MSG_WriteChar(msg, ent->v->velocity[i] * (1.0f / 16.0f));
-                       else if (sv.protocol == PROTOCOL_DARKPLACES5 || sv.protocol == PROTOCOL_DARKPLACES6)
-                               MSG_WriteCoord32f(msg, ent->v->velocity[i]);
+                               MSG_WriteChar(msg, ent->fields.server->velocity[i] * (1.0f / 16.0f));
+                       else
+                               MSG_WriteCoord32f(msg, ent->fields.server->velocity[i]);
                }
        }
 
@@ -1006,7 +1140,7 @@ void SV_WriteClientdataToMessage (client_t *client, edict_t *ent, sizebuf_t *msg
                if (bits & SU_VIEWZOOM)
                        MSG_WriteShort (msg, min(stats[STAT_VIEWZOOM], 65535));
        }
-       else if (sv.protocol != PROTOCOL_DARKPLACES6)
+       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)
        {
                if (bits & SU_WEAPONFRAME)
                        MSG_WriteByte (msg, stats[STAT_WEAPONFRAME]);
@@ -1031,9 +1165,9 @@ void SV_WriteClientdataToMessage (client_t *client, edict_t *ent, sizebuf_t *msg
                        MSG_WriteByte (msg, stats[STAT_WEAPON]);
                if (bits & SU_VIEWZOOM)
                {
-                       if (sv.protocol == PROTOCOL_DARKPLACES4)
+                       if (sv.protocol == PROTOCOL_DARKPLACES2 || sv.protocol == PROTOCOL_DARKPLACES3 || sv.protocol == PROTOCOL_DARKPLACES4)
                                MSG_WriteByte (msg, min(stats[STAT_VIEWZOOM], 255));
-                       else if (sv.protocol == PROTOCOL_DARKPLACES5 || sv.protocol == PROTOCOL_DARKPLACES6)
+                       else
                                MSG_WriteShort (msg, min(stats[STAT_VIEWZOOM], 65535));
                }
        }
@@ -1044,8 +1178,8 @@ void SV_WriteClientdataToMessage (client_t *client, edict_t *ent, sizebuf_t *msg
 SV_SendClientDatagram
 =======================
 */
-static qbyte sv_sendclientdatagram_buf[NET_MAXMESSAGE]; // FIXME?
-qboolean SV_SendClientDatagram (client_t *client)
+static unsigned char sv_sendclientdatagram_buf[NET_MAXMESSAGE]; // FIXME?
+void SV_SendClientDatagram (client_t *client)
 {
        int rate, maxrate, maxsize, maxsize2;
        sizebuf_t msg;
@@ -1057,55 +1191,62 @@ qboolean SV_SendClientDatagram (client_t *client)
                maxsize = sizeof(sv_sendclientdatagram_buf);
                maxsize2 = sizeof(sv_sendclientdatagram_buf);
        }
-       else if (sv.protocol == PROTOCOL_DARKPLACES5 || sv.protocol == PROTOCOL_DARKPLACES6)
+       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)
        {
-               // PROTOCOL_DARKPLACES5 supports packet size limiting of updates
+               // 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;
        }
-       else
-       {
-               // 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;
-       }
 
        msg.data = sv_sendclientdatagram_buf;
        msg.maxsize = maxsize;
        msg.cursize = 0;
 
-       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);
-       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);
-
-// send the datagram
-       if (NetConn_SendUnreliableMessage (client->netconnection, &msg) == -1)
+       if (host_client->spawned)
+       {
+               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);
+       }
+       else if (realtime > client->keepalivetime)
        {
-               SV_DropClient (true);// if the message couldn't send, kick off
-               return false;
+               // 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);
        }
 
-       return true;
+// send the datagram
+       NetConn_SendUnreliableMessage (client->netconnection, &msg, sv.protocol);
 }
 
 /*
@@ -1117,24 +1258,24 @@ void SV_UpdateToReliableMessages (void)
 {
        int i, j;
        client_t *client;
-       eval_t *val;
-       char *name;
-       char *model;
-       char *skin;
+       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++)
        {
                // update the host_client fields we care about according to the entity fields
-               host_client->edict = EDICT_NUM(i+1);
+               host_client->edict = PRVM_EDICT_NUM(i+1);
 
                // DP_SV_CLIENTNAME
-               name = PR_GetString(host_client->edict->v->netname);
+               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->v->netname = PR_SetString(host_client->name);
+               host_client->edict->fields.server->netname = PRVM_SetEngineString(host_client->name);
                if (strcmp(host_client->old_name, host_client->name))
                {
                        if (host_client->spawned)
@@ -1148,7 +1289,7 @@ void SV_UpdateToReliableMessages (void)
 
                // DP_SV_CLIENTCOLORS
                // this is always found (since it's added by the progs loader)
-               if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_clientcolors)))
+               if ((val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_clientcolors)))
                        host_client->colors = (int)val->_float;
                if (host_client->old_colors != host_client->colors)
                {
@@ -1160,23 +1301,27 @@ void SV_UpdateToReliableMessages (void)
                }
 
                // NEXUIZ_PLAYERMODEL
-               model = PR_GetString(host_client->edict->v->playermodel);
-               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));
-               host_client->edict->v->playermodel = PR_SetString(host_client->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);
+               }
 
                // NEXUIZ_PLAYERSKIN
-               skin = PR_GetString(host_client->edict->v->playerskin);
-               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));
-               host_client->edict->v->playerskin = PR_SetString(host_client->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);
+               }
 
                // frags
-               host_client->frags = (int)host_client->edict->v->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;
@@ -1189,36 +1334,12 @@ void SV_UpdateToReliableMessages (void)
 
        for (j = 0, client = svs.clients;j < svs.maxclients;j++, client++)
                if (client->netconnection)
-                       SZ_Write (&client->message, sv.reliable_datagram.data, sv.reliable_datagram.cursize);
+                       SZ_Write (&client->netconnection->message, sv.reliable_datagram.data, sv.reliable_datagram.cursize);
 
        SZ_Clear (&sv.reliable_datagram);
 }
 
 
-/*
-=======================
-SV_SendNop
-
-Send a nop message without trashing or sending the accumulated client
-message buffer
-=======================
-*/
-void SV_SendNop (client_t *client)
-{
-       sizebuf_t       msg;
-       qbyte           buf[4];
-
-       msg.data = buf;
-       msg.maxsize = sizeof(buf);
-       msg.cursize = 0;
-
-       MSG_WriteChar (&msg, svc_nop);
-
-       if (NetConn_SendUnreliableMessage (client->netconnection, &msg) == -1)
-               SV_DropClient (true);   // if the message couldn't send, kick off
-       client->last_message = realtime;
-}
-
 /*
 =======================
 SV_SendClientMessages
@@ -1228,6 +1349,9 @@ void SV_SendClientMessages (void)
 {
        int i, prepared = false;
 
+       if (sv.protocol == PROTOCOL_QUAKEWORLD)
+               Sys_Error("SV_SendClientMessages: no quakeworld support\n");
+
 // update frags, names, etc
        SV_UpdateToReliableMessages();
 
@@ -1237,59 +1361,21 @@ void SV_SendClientMessages (void)
                if (!host_client->active)
                        continue;
                if (!host_client->netconnection)
-               {
-                       SZ_Clear(&host_client->message);
                        continue;
-               }
 
-               if (host_client->deadsocket || host_client->message.overflowed)
+               if (host_client->netconnection->message.overflowed)
                {
                        SV_DropClient (true);   // if the message couldn't send, kick off
                        continue;
                }
 
-               if (host_client->spawned)
-               {
-                       if (!prepared)
-                       {
-                               prepared = true;
-                               // only prepare entities once per frame
-                               SV_PrepareEntitiesForSending();
-                       }
-                       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
-                       }
-               }
-
-               if (host_client->message.cursize || host_client->dropasap)
+               if (!prepared)
                {
-                       if (!NetConn_CanSendMessage (host_client->netconnection))
-                               continue;
-
-                       if (host_client->dropasap)
-                               SV_DropClient (false);  // went to another level
-                       else
-                       {
-                               if (NetConn_SendReliableMessage (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;
-                       }
+                       prepared = true;
+                       // only prepare entities once per frame
+                       SV_PrepareEntitiesForSending();
                }
+               SV_SendClientDatagram (host_client);
        }
 
 // clear muzzle flashes
@@ -1311,9 +1397,9 @@ SV_ModelIndex
 
 ================
 */
-int SV_ModelIndex(char *s, int precachemode)
+int SV_ModelIndex(const char *s, int precachemode)
 {
-       int i, limit = (sv.protocol == PROTOCOL_QUAKE ? 256 : MAX_MODELS);
+       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;
@@ -1327,7 +1413,7 @@ int SV_ModelIndex(char *s, int precachemode)
                {
                        if (precachemode)
                        {
-                               if (sv.state != ss_loading && (sv.protocol == PROTOCOL_QUAKE || sv.protocol == PROTOCOL_DARKPLACES1 || sv.protocol == PROTOCOL_DARKPLACES2 || sv.protocol == PROTOCOL_DARKPLACES3 || sv.protocol == PROTOCOL_DARKPLACES4 || sv.protocol == PROTOCOL_DARKPLACES5))
+                               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;
@@ -1336,7 +1422,7 @@ int SV_ModelIndex(char *s, int precachemode)
                                        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.protocol == PROTOCOL_DARKPLACES6)
+                               if (sv.state != ss_loading)
                                {
                                        MSG_WriteByte(&sv.reliable_datagram, svc_precache);
                                        MSG_WriteShort(&sv.reliable_datagram, i);
@@ -1360,9 +1446,9 @@ SV_SoundIndex
 
 ================
 */
-int SV_SoundIndex(char *s, int precachemode)
+int SV_SoundIndex(const char *s, int precachemode)
 {
-       int i, limit = (sv.protocol == PROTOCOL_QUAKE ? 256 : MAX_SOUNDS);
+       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;
@@ -1376,7 +1462,7 @@ int SV_SoundIndex(char *s, int precachemode)
                {
                        if (precachemode)
                        {
-                               if (sv.state != ss_loading && (sv.protocol == PROTOCOL_QUAKE || sv.protocol == PROTOCOL_DARKPLACES1 || sv.protocol == PROTOCOL_DARKPLACES2 || sv.protocol == PROTOCOL_DARKPLACES3 || sv.protocol == PROTOCOL_DARKPLACES4 || sv.protocol == PROTOCOL_DARKPLACES5))
+                               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;
@@ -1384,7 +1470,7 @@ int SV_SoundIndex(char *s, int precachemode)
                                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.protocol == PROTOCOL_DARKPLACES6)
+                               if (sv.state != ss_loading)
                                {
                                        MSG_WriteByte(&sv.reliable_datagram, svc_precache);
                                        MSG_WriteShort(&sv.reliable_datagram, i + 32768);
@@ -1411,40 +1497,40 @@ SV_CreateBaseline
 void SV_CreateBaseline (void)
 {
        int i, entnum, large;
-       edict_t *svent;
+       prvm_edict_t *svent;
 
        // LordHavoc: clear *all* states (note just active ones)
-       for (entnum = 0;entnum < sv.max_edicts;entnum++)
+       for (entnum = 0;entnum < prog->max_edicts;entnum++)
        {
                // get the current server version
-               svent = EDICT_NUM(entnum);
+               svent = PRVM_EDICT_NUM(entnum);
 
                // LordHavoc: always clear state values, whether the entity is in use or not
-               svent->e->baseline = defaultstate;
+               svent->priv.server->baseline = defaultstate;
 
-               if (svent->e->free)
+               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->e->baseline.origin);
-               VectorCopy (svent->v->angles, svent->e->baseline.angles);
-               svent->e->baseline.frame = svent->v->frame;
-               svent->e->baseline.skin = svent->v->skin;
+               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 = svent->fields.server->frame;
+               svent->priv.server->baseline.skin = svent->fields.server->skin;
                if (entnum > 0 && entnum <= svs.maxclients)
                {
-                       svent->e->baseline.colormap = entnum;
-                       svent->e->baseline.modelindex = SV_ModelIndex("progs/player.mdl", 1);
+                       svent->priv.server->baseline.colormap = entnum;
+                       svent->priv.server->baseline.modelindex = SV_ModelIndex("progs/player.mdl", 1);
                }
                else
                {
-                       svent->e->baseline.colormap = 0;
-                       svent->e->baseline.modelindex = svent->v->modelindex;
+                       svent->priv.server->baseline.colormap = 0;
+                       svent->priv.server->baseline.modelindex = svent->fields.server->modelindex;
                }
 
                large = false;
-               if (svent->e->baseline.modelindex & 0xFF00 || svent->e->baseline.frame & 0xFF00)
+               if (svent->priv.server->baseline.modelindex & 0xFF00 || svent->priv.server->baseline.frame & 0xFF00)
                        large = true;
 
                // add to the message
@@ -1456,50 +1542,25 @@ void SV_CreateBaseline (void)
 
                if (large)
                {
-                       MSG_WriteShort (&sv.signon, svent->e->baseline.modelindex);
-                       MSG_WriteShort (&sv.signon, svent->e->baseline.frame);
+                       MSG_WriteShort (&sv.signon, svent->priv.server->baseline.modelindex);
+                       MSG_WriteShort (&sv.signon, svent->priv.server->baseline.frame);
                }
                else
                {
-                       MSG_WriteByte (&sv.signon, svent->e->baseline.modelindex);
-                       MSG_WriteByte (&sv.signon, svent->e->baseline.frame);
+                       MSG_WriteByte (&sv.signon, svent->priv.server->baseline.modelindex);
+                       MSG_WriteByte (&sv.signon, svent->priv.server->baseline.frame);
                }
-               MSG_WriteByte (&sv.signon, svent->e->baseline.colormap);
-               MSG_WriteByte (&sv.signon, svent->e->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_WriteCoord(&sv.signon, svent->e->baseline.origin[i], sv.protocol);
-                       MSG_WriteAngle(&sv.signon, svent->e->baseline.angles[i], sv.protocol);
+                       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");
-       NetConn_SendToAll (&msg, 5);
-
-       if (cls.state != ca_dedicated)
-               Cmd_ExecuteString ("reconnect\n", src_command);
-}
-
-
 /*
 ================
 SV_SaveSpawnparms
@@ -1512,7 +1573,7 @@ void SV_SaveSpawnparms (void)
 {
        int             i, j;
 
-       svs.serverflags = pr_global_struct->serverflags;
+       svs.serverflags = prog->globals.server->serverflags;
 
        for (i = 0, host_client = svs.clients;i < svs.maxclients;i++, host_client++)
        {
@@ -1520,55 +1581,55 @@ void SV_SaveSpawnparms (void)
                        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;
-       edict_t *ent;
-       int oldmax_edicts = sv.max_edicts;
-       void *oldedictsengineprivate = sv.edictsengineprivate;
-       void *oldedictsfields = sv.edictsfields;
+       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 (sv.max_edicts >= MAX_EDICTS)
+       if (prog->max_edicts >= MAX_EDICTS)
                return;
 
        // links don't survive the transition, so unlink everything
-       for (i = 0, ent = sv.edicts;i < sv.max_edicts;i++, ent++)
+       for (i = 0, ent = prog->edicts;i < prog->max_edicts;i++, ent++)
        {
-               if (!ent->e->free)
-                       SV_UnlinkEdict(sv.edicts + i);
-               memset(&ent->e->areagrid, 0, sizeof(ent->e->areagrid));
+               if (!ent->priv.server->free)
+                       SV_UnlinkEdict(prog->edicts + i);
+               memset(&ent->priv.server->areagrid, 0, sizeof(ent->priv.server->areagrid));
        }
        SV_ClearWorld();
 
-       sv.max_edicts   = min(sv.max_edicts + 256, MAX_EDICTS);
-       sv.edictsengineprivate = Mem_Alloc(sv_edicts_mempool, sv.max_edicts * sizeof(edict_engineprivate_t));
-       sv.edictsfields = Mem_Alloc(sv_edicts_mempool, sv.max_edicts * pr_edict_size);
-       sv.moved_edicts = Mem_Alloc(sv_edicts_mempool, sv.max_edicts * sizeof(edict_t *));
+       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(sv.edictsengineprivate, oldedictsengineprivate, oldmax_edicts * sizeof(edict_engineprivate_t));
-       memcpy(sv.edictsfields, oldedictsfields, oldmax_edicts * pr_edict_size);
+       memcpy(prog->edictprivate, oldedictsengineprivate, oldmax_edicts * sizeof(edict_engineprivate_t));
+       memcpy(prog->edictsfields, oldedictsfields, oldmax_edicts * prog->edict_size);
 
-       for (i = 0, ent = sv.edicts;i < sv.max_edicts;i++, ent++)
+       for (i = 0, ent = prog->edicts;i < prog->max_edicts;i++, ent++)
        {
-               ent->e = sv.edictsengineprivate + i;
-               ent->v = (void *)((qbyte *)sv.edictsfields + i * pr_edict_size);
+               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->e->free)
+               if (!ent->priv.server->free)
                        SV_LinkEdict(ent, false);
        }
 
-       Mem_Free(oldedictsengineprivate);
-       Mem_Free(oldedictsfields);
-       Mem_Free(oldmoved_edicts);
-}
+       PR_Free(oldedictsengineprivate);
+       PR_Free(oldedictsfields);
+       PR_Free(oldmoved_edicts);
+}*/
 
 /*
 ================
@@ -1581,15 +1642,18 @@ extern float            scr_centertime_off;
 
 void SV_SpawnServer (const char *server)
 {
-       edict_t *ent;
+       prvm_edict_t *ent;
        int i;
-       qbyte *entities;
+       char *entities;
        model_t *worldmodel;
        char modelname[sizeof(sv.modelname)];
 
        Con_DPrintf("SpawnServer: %s\n", server);
 
-       snprintf (modelname, sizeof(modelname), "maps/%s.bsp", 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)
        {
@@ -1608,11 +1672,20 @@ void SV_SpawnServer (const char *server)
 // tell all connected clients that we are going to a new level
 //
        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
        {
-               // make sure cvars have been checked before opening the ports
-               NetConn_ServerFrame();
+               // open server port
                NetConn_OpenServerPorts(true);
        }
 
@@ -1621,73 +1694,59 @@ void SV_SpawnServer (const char *server)
 //
        if (coop.integer)
                Cvar_SetValue ("deathmatch", 0);
-       current_skill = bound(0, (int)(skill.value + 0.5), 3);
-
-       Cvar_SetValue ("skill", (float)current_skill);
+       // 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);
 
 //
 // set up the new server
 //
-       Host_ClearMemory ();
-
        memset (&sv, 0, sizeof(sv));
 
+       SV_VM_Setup();
+
+       sv.active = true;
+
        strlcpy (sv.name, server, sizeof (sv.name));
 
-       sv.netquakecompatible = false;
-       if (!strcasecmp(sv_protocolname.string, "QUAKE"))
+       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.netquakecompatible = true;
-       }
-       else if (!strcasecmp(sv_protocolname.string, "QUAKEDP"))
-               sv.protocol = PROTOCOL_QUAKE;
-       else if (!strcasecmp(sv_protocolname.string, "DARKPLACES1"))
-               sv.protocol = PROTOCOL_DARKPLACES1;
-       else if (!strcasecmp(sv_protocolname.string, "DARKPLACES2"))
-               sv.protocol = PROTOCOL_DARKPLACES2;
-       else if (!strcasecmp(sv_protocolname.string, "DARKPLACES3"))
-               sv.protocol = PROTOCOL_DARKPLACES3;
-       else if (!strcasecmp(sv_protocolname.string, "DARKPLACES4"))
-               sv.protocol = PROTOCOL_DARKPLACES4;
-       else if (!strcasecmp(sv_protocolname.string, "DARKPLACES5"))
-               sv.protocol = PROTOCOL_DARKPLACES5;
-       else if (!strcasecmp(sv_protocolname.string, "DARKPLACES6"))
-               sv.protocol = PROTOCOL_DARKPLACES6;
-       else
-       {
-               sv.protocol = PROTOCOL_DARKPLACES6;
-               Con_Printf("Unknown sv_protocolname \"%s\", valid values are QUAKE, QUAKEDP, DARKPLACES1, DARKPLACES2, DARKPLACES3, DARKPLACES4, DARKPLACES5, DARKPLACES6, falling back to DARKPLACES6 protocol\n", sv_protocolname.string);
        }
 
+       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
-       sv.max_edicts = max(svs.maxclients + 1, 512);
-       sv.max_edicts = min(sv.max_edicts, MAX_EDICTS);
+       // 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);
 
-       // clear the edict memory pool
-       Mem_EmptyPool(sv_edicts_mempool);
-       // edict_t structures (hidden from progs)
-       sv.edicts = Mem_Alloc(sv_edicts_mempool, MAX_EDICTS * sizeof(edict_t));
+       // prvm_edict_t structures (hidden from progs)
+       prog->edicts = PR_Alloc(MAX_EDICTS * sizeof(prvm_edict_t));
        // engine private structures (hidden from progs)
-       sv.edictsengineprivate = Mem_Alloc(sv_edicts_mempool, sv.max_edicts * sizeof(edict_engineprivate_t));
+       prog->edictprivate = PR_Alloc(prog->max_edicts * sizeof(edict_engineprivate_t));
        // progs fields, often accessed by server
-       sv.edictsfields = Mem_Alloc(sv_edicts_mempool, sv.max_edicts * pr_edict_size);
+       prog->edictsfields = PR_Alloc(prog->max_edicts * prog->edict_size);*/
        // used by PushMove to move back pushed entities
-       sv.moved_edicts = Mem_Alloc(sv_edicts_mempool, sv.max_edicts * sizeof(edict_t *));
-       for (i = 0;i < sv.max_edicts;i++)
+       sv.moved_edicts = (prvm_edict_t **)PRVM_Alloc(prog->max_edicts * sizeof(prvm_edict_t *));
+       /*for (i = 0;i < prog->max_edicts;i++)
        {
-               ent = sv.edicts + i;
-               ent->e = sv.edictsengineprivate + i;
-               ent->v = (void *)((qbyte *)sv.edictsfields + i * pr_edict_size);
-       }
+               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);
+       }*/
 
-       // fix up client->edict pointers for returning clients right away...
+       // reset client csqc entity versions right away.
        for (i = 0, host_client = svs.clients;i < svs.maxclients;i++, host_client++)
-               host_client->edict = EDICT_NUM(i + 1);
+               EntityFrameCSQC_InitClientVersions(i, true);
 
        sv.datagram.maxsize = sizeof(sv.datagram_buf);
        sv.datagram.cursize = 0;
@@ -1702,12 +1761,13 @@ void SV_SpawnServer (const char *server)
        sv.signon.data = sv.signon_buf;
 
 // leave slots at start for clients only
-       sv.num_edicts = svs.maxclients+1;
+       //prog->num_edicts = svs.maxclients+1;
 
        sv.state = ss_loading;
+       prog->allowworldwrites = true;
        sv.paused = false;
 
-       sv.time = 1.0;
+       *prog->time = sv.time = 1.0;
 
        Mod_ClearUsed();
        worldmodel->used = true;
@@ -1728,73 +1788,574 @@ void SV_SpawnServer (const char *server)
        strlcpy(sv.model_precache[1], sv.modelname, sizeof(sv.model_precache[1]));
        for (i = 1;i < sv.worldmodel->brush.numsubmodels;i++)
        {
-               snprintf(sv.model_precache[i+1], sizeof(sv.model_precache[i+1]), "*%i", i);
+               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->e->free = false;
-       ent->v->model = PR_SetString(sv.modelname);
-       ent->v->modelindex = 1;         // world model
-       ent->v->solid = SOLID_BSP;
-       ent->v->movetype = MOVETYPE_PUSH;
+       // 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.integer;
+               prog->globals.server->coop = coop.integer;
        else
-               pr_global_struct->deathmatch = deathmatch.integer;
+               prog->globals.server->deathmatch = deathmatch.integer;
 
-       pr_global_struct->mapname = PR_SetString(sv.name);
+       prog->globals.server->mapname = PRVM_SetEngineString(sv.name);
 
 // serverflags are for cross level information (sigils)
-       pr_global_struct->serverflags = svs.serverflags;
+       prog->globals.server->serverflags = svs.serverflags;
+
+       // 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
-       entities = NULL;
-       if (sv_entpatch.integer)
-               entities = FS_LoadFile(va("maps/%s.ent", sv.name), tempmempool, true);
-       if (entities)
+       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);
-               ED_LoadFromFile (entities);
+               PRVM_ED_LoadFromFile (entities);
                Mem_Free(entities);
        }
        else
-               ED_LoadFromFile (sv.worldmodel->brush.entities);
+               PRVM_ED_LoadFromFile (sv.worldmodel->brush.entities);
 
 
        // LordHavoc: clear world angles (to fix e3m3.bsp)
-       VectorClear(sv.edicts->v->angles);
-
-       sv.active = true;
+       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
        for (i = 0;i < 2;i++)
        {
-               sv.frametime = pr_global_struct->frametime = host_frametime = 0.1;
+               sv.frametime = host_frametime = 0.1;
                SV_Physics ();
        }
 
        Mod_PurgeUnused();
 
 // create a baseline for more efficient communications
-       if (sv.protocol == PROTOCOL_QUAKE)
+       if (sv.protocol == PROTOCOL_QUAKE || sv.protocol == PROTOCOL_QUAKEDP || sv.protocol == PROTOCOL_NEHAHRAMOVIE)
                SV_CreateBaseline ();
 
-// send serverinfo to all connected clients
-       // (note this also handles botclients coming back from a level change)
+// 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)
+       {
+               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;
+
+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");
+
+       // 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;
+}
+
+#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;
+}