]> git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - sv_main.c
protocol/dp8: Implement parting messages
[xonotic/darkplaces.git] / sv_main.c
index 1e380e1ba0ff560b76800a6f8cfc27de47e5bc72..777d3e577959ff730fbaa2ce4a53a34f46d1dce6 100644 (file)
--- a/sv_main.c
+++ b/sv_main.c
@@ -76,7 +76,7 @@ cvar_t sv_checkforpacketsduringsleep = {CF_SERVER, "sv_checkforpacketsduringslee
 cvar_t sv_clmovement_enable = {CF_SERVER, "sv_clmovement_enable", "1", "whether to allow clients to use cl_movement prediction, which can cause choppy movement on the server which may annoy other players"};
 cvar_t sv_clmovement_minping = {CF_SERVER, "sv_clmovement_minping", "0", "if client ping is below this time in milliseconds, then their ability to use cl_movement prediction is disabled for a while (as they don't need it)"};
 cvar_t sv_clmovement_minping_disabletime = {CF_SERVER, "sv_clmovement_minping_disabletime", "1000", "when client falls below minping, disable their prediction for this many milliseconds (should be at least 1000 or else their prediction may turn on/off frequently)"};
-cvar_t sv_clmovement_inputtimeout = {CF_SERVER, "sv_clmovement_inputtimeout", "0.2", "when a client does not send input for this many seconds, force them to move anyway (unlike QuakeWorld)"};
+cvar_t sv_clmovement_inputtimeout = {CF_SERVER, "sv_clmovement_inputtimeout", "0.1", "when a client does not send input for this many seconds (max 0.1), force them to move anyway (unlike QuakeWorld)"};
 cvar_t sv_cullentities_nevercullbmodels = {CF_SERVER, "sv_cullentities_nevercullbmodels", "0", "if enabled the clients are always notified of moving doors and lifts and other submodels of world (warning: eats a lot of network bandwidth on some levels!)"};
 cvar_t sv_cullentities_pvs = {CF_SERVER, "sv_cullentities_pvs", "1", "fast but loose culling of hidden entities"};
 cvar_t sv_cullentities_stats = {CF_SERVER, "sv_cullentities_stats", "0", "displays stats on network entities culled by various methods for each client"};
@@ -147,8 +147,8 @@ cvar_t sv_sound_watersplash = {CF_SERVER, "sv_sound_watersplash", "misc/h2ohit1.
 cvar_t sv_stepheight = {CF_SERVER | CF_NOTIFY, "sv_stepheight", "18", "how high you can step up (TW_SV_STEPCONTROL extension)"};
 cvar_t sv_stopspeed = {CF_SERVER | CF_NOTIFY, "sv_stopspeed","100", "how fast you come to a complete stop"};
 cvar_t sv_wallfriction = {CF_SERVER | CF_NOTIFY, "sv_wallfriction", "1", "how much you slow down when sliding along a wall"};
-cvar_t sv_wateraccelerate = {CF_SERVER, "sv_wateraccelerate", "-1", "rate at which a player accelerates to sv_maxspeed while in the air, if less than 0 the sv_accelerate variable is used instead"};
-cvar_t sv_waterfriction = {CF_SERVER | CF_NOTIFY, "sv_waterfriction","-1", "how fast you slow down, if less than 0 the sv_friction variable is used instead"};
+cvar_t sv_wateraccelerate = {CF_SERVER, "sv_wateraccelerate", "-1", "rate at which a player accelerates to sv_maxspeed while in water, if less than 0 the sv_accelerate variable is used instead"};
+cvar_t sv_waterfriction = {CF_SERVER | CF_NOTIFY, "sv_waterfriction","-1", "how fast you slow down in water, if less than 0 the sv_friction variable is used instead"};
 cvar_t sv_warsowbunny_airforwardaccel = {CF_SERVER, "sv_warsowbunny_airforwardaccel", "1.00001", "how fast you accelerate until you reach sv_maxspeed"};
 cvar_t sv_warsowbunny_accel = {CF_SERVER, "sv_warsowbunny_accel", "0.1585", "how fast you accelerate until after reaching sv_maxspeed (it gets harder as you near sv_warsowbunny_topspeed)"};
 cvar_t sv_warsowbunny_topspeed = {CF_SERVER, "sv_warsowbunny_topspeed", "925", "soft speed limit (can get faster with rjs and on ramps)"};
@@ -205,6 +205,8 @@ cvar_t halflifebsp = {CF_SERVER, "halflifebsp", "0", "indicates the current map
 cvar_t sv_mapformat_is_quake2 = {CF_SERVER, "sv_mapformat_is_quake2", "0", "indicates the current map is q2bsp format (useful to know because of different entity behaviors, .frame on submodels and other things)"};
 cvar_t sv_mapformat_is_quake3 = {CF_SERVER, "sv_mapformat_is_quake3", "0", "indicates the current map is q2bsp format (useful to know because of different entity behaviors)"};
 
+cvar_t sv_writepicture_quality = {CF_SERVER | CF_ARCHIVE, "sv_writepicture_quality", "10", "WritePicture quality offset (higher means better quality, but slower)"};
+
 server_t sv;
 server_static_t svs;
 
@@ -432,6 +434,56 @@ static void SV_AreaStats_f(cmd_state_t *cmd)
        World_PrintAreaStats(&sv.world, "server");
 }
 
+static void SV_ServerOptions (void)
+{
+       int i;
+
+       // general default
+       svs.maxclients = 8;
+
+// COMMANDLINEOPTION: Server: -dedicated [playerlimit] starts a dedicated server (with a command console), default playerlimit is 8
+// COMMANDLINEOPTION: Server: -listen [playerlimit] starts a multiplayer server with graphical client, like singleplayer but other players can connect, default playerlimit is 8
+       // if no client is in the executable or -dedicated is specified on
+       // commandline, start a dedicated server
+       i = Sys_CheckParm ("-dedicated");
+       if (i || !cl_available)
+       {
+               cls.state = ca_dedicated;
+               // check for -dedicated specifying how many players
+               if (i && i + 1 < sys.argc && atoi (sys.argv[i+1]) >= 1)
+                       svs.maxclients = atoi (sys.argv[i+1]);
+               if (Sys_CheckParm ("-listen"))
+                       Con_Printf ("Only one of -dedicated or -listen can be specified\n");
+               // default sv_public on for dedicated servers (often hosted by serious administrators), off for listen servers (often hosted by clueless users)
+               Cvar_SetValue(&cvars_all, "sv_public", 1);
+       }
+       else if (cl_available)
+       {
+               // client exists and not dedicated, check if -listen is specified
+               cls.state = ca_disconnected;
+               i = Sys_CheckParm ("-listen");
+               if (i)
+               {
+                       // default players unless specified
+                       if (i + 1 < sys.argc && atoi (sys.argv[i+1]) >= 1)
+                               svs.maxclients = atoi (sys.argv[i+1]);
+               }
+               else
+               {
+                       // default players in some games, singleplayer in most
+                       if (gamemode != GAME_GOODVSBAD2 && !IS_NEXUIZ_DERIVED(gamemode) && gamemode != GAME_BATTLEMECH)
+                               svs.maxclients = 1;
+               }
+       }
+
+       svs.maxclients = svs.maxclients_next = bound(1, svs.maxclients, MAX_SCOREBOARD);
+
+       svs.clients = (client_t *)Mem_Alloc(sv_mempool, sizeof(client_t) * svs.maxclients);
+
+       if (svs.maxclients > 1 && !deathmatch.integer && !coop.integer)
+               Cvar_SetValueQuick(&deathmatch, 1);
+}
+
 /*
 ===============
 SV_Init
@@ -474,8 +526,8 @@ void SV_Init (void)
        Cvar_RegisterVariable (&skill);
        Cvar_RegisterVariable (&host_timescale);
        Cvar_RegisterCallback (&host_timescale, Host_Timescale_c);
-       Cvar_RegisterAlias (&host_timescale, "slowmo");
-       Cvar_RegisterAlias (&host_timescale, "timescale");
+       Cvar_RegisterVirtual (&host_timescale, "slowmo");
+       Cvar_RegisterVirtual (&host_timescale, "timescale");
        Cvar_RegisterVariable (&sv_accelerate);
        Cvar_RegisterVariable (&sv_aim);
        Cvar_RegisterVariable (&sv_airaccel_qw);
@@ -566,7 +618,7 @@ void SV_Init (void)
        Cvar_RegisterVariable (&sv_protocolname);
        Cvar_RegisterVariable (&sv_random_seed);
        Cvar_RegisterVariable (&host_limitlocal);
-       Cvar_RegisterAlias(&host_limitlocal, "sv_ratelimitlocalplayer");
+       Cvar_RegisterVirtual(&host_limitlocal, "sv_ratelimitlocalplayer");
        Cvar_RegisterVariable (&sv_sound_land);
        Cvar_RegisterVariable (&sv_sound_watersplash);
        Cvar_RegisterVariable (&sv_stepheight);
@@ -631,9 +683,15 @@ void SV_Init (void)
        Cvar_RegisterVariable (&sv_mapformat_is_quake2);
        Cvar_RegisterVariable (&sv_mapformat_is_quake3);
 
+       Cvar_RegisterVariable (&sv_writepicture_quality);
+
        SV_InitOperatorCommands();
+       host.hook.SV_Shutdown = SV_Shutdown;
 
        sv_mempool = Mem_AllocPool("server", 0, NULL);
+
+       SV_ServerOptions();
+       Cvar_Callback(&sv_netport);
 }
 
 static void SV_SaveEntFile_f(cmd_state_t *cmd)
@@ -647,239 +705,6 @@ static void SV_SaveEntFile_f(cmd_state_t *cmd)
        FS_WriteFile(va(vabuf, sizeof(vabuf), "%s.ent", sv.worldnamenoextension), sv.worldmodel->brush.entities, (fs_offset_t)strlen(sv.worldmodel->brush.entities));
 }
 
-
-/*
-=============================================================================
-
-EVENT MESSAGES
-
-=============================================================================
-*/
-
-/*
-==================
-SV_StartParticle
-
-Make sure the event gets sent to all clients
-==================
-*/
-void SV_StartParticle (vec3_t org, vec3_t dir, int color, int count)
-{
-       int i;
-
-       if (sv.datagram.cursize > MAX_PACKETFRAGMENT-18)
-               return;
-       MSG_WriteByte (&sv.datagram, svc_particle);
-       MSG_WriteCoord (&sv.datagram, org[0], sv.protocol);
-       MSG_WriteCoord (&sv.datagram, org[1], sv.protocol);
-       MSG_WriteCoord (&sv.datagram, org[2], sv.protocol);
-       for (i=0 ; i<3 ; i++)
-               MSG_WriteChar (&sv.datagram, (int)bound(-128, dir[i]*16, 127));
-       MSG_WriteByte (&sv.datagram, count);
-       MSG_WriteByte (&sv.datagram, color);
-       SV_FlushBroadcastMessages();
-}
-
-/*
-==================
-SV_StartEffect
-
-Make sure the event gets sent to all clients
-==================
-*/
-void SV_StartEffect (vec3_t org, int modelindex, int startframe, int framecount, int framerate)
-{
-       if (modelindex >= 256 || startframe >= 256)
-       {
-               if (sv.datagram.cursize > MAX_PACKETFRAGMENT-19)
-                       return;
-               MSG_WriteByte (&sv.datagram, svc_effect2);
-               MSG_WriteCoord (&sv.datagram, org[0], sv.protocol);
-               MSG_WriteCoord (&sv.datagram, org[1], sv.protocol);
-               MSG_WriteCoord (&sv.datagram, org[2], sv.protocol);
-               MSG_WriteShort (&sv.datagram, modelindex);
-               MSG_WriteShort (&sv.datagram, startframe);
-               MSG_WriteByte (&sv.datagram, framecount);
-               MSG_WriteByte (&sv.datagram, framerate);
-       }
-       else
-       {
-               if (sv.datagram.cursize > MAX_PACKETFRAGMENT-17)
-                       return;
-               MSG_WriteByte (&sv.datagram, svc_effect);
-               MSG_WriteCoord (&sv.datagram, org[0], sv.protocol);
-               MSG_WriteCoord (&sv.datagram, org[1], sv.protocol);
-               MSG_WriteCoord (&sv.datagram, org[2], sv.protocol);
-               MSG_WriteByte (&sv.datagram, modelindex);
-               MSG_WriteByte (&sv.datagram, startframe);
-               MSG_WriteByte (&sv.datagram, framecount);
-               MSG_WriteByte (&sv.datagram, framerate);
-       }
-       SV_FlushBroadcastMessages();
-}
-
-/*
-==================
-SV_StartSound
-
-Each entity can have eight independant sound sources, like voice,
-weapon, feet, etc.
-
-Channel 0 is an auto-allocate channel, the others override anything
-already running on that entity/channel pair.
-
-An attenuation of 0 will play full volume everywhere in the level.
-Larger attenuations will drop off.  (max 4 attenuation)
-
-==================
-*/
-void SV_StartSound (prvm_edict_t *entity, int channel, const char *sample, int nvolume, float attenuation, qbool reliable, float speed)
-{
-       prvm_prog_t *prog = SVVM_prog;
-       sizebuf_t *dest;
-       int sound_num, field_mask, i, ent, speed4000;
-
-       dest = (reliable ? &sv.reliable_datagram : &sv.datagram);
-
-       if (nvolume < 0 || nvolume > 255)
-       {
-               Con_Printf ("SV_StartSound: volume = %i\n", nvolume);
-               return;
-       }
-
-       if (attenuation < 0 || attenuation > 4)
-       {
-               Con_Printf ("SV_StartSound: attenuation = %f\n", attenuation);
-               return;
-       }
-
-       if (!IS_CHAN(channel))
-       {
-               Con_Printf ("SV_StartSound: channel = %i\n", channel);
-               return;
-       }
-
-       channel = CHAN_ENGINE2NET(channel);
-
-       if (sv.datagram.cursize > MAX_PACKETFRAGMENT-21)
-               return;
-
-// find precache number for sound
-       sound_num = SV_SoundIndex(sample, 1);
-       if (!sound_num)
-               return;
-
-       ent = PRVM_NUM_FOR_EDICT(entity);
-
-       speed4000 = (int)floor(speed * 4000.0f + 0.5f);
-       field_mask = 0;
-       if (nvolume != DEFAULT_SOUND_PACKET_VOLUME)
-               field_mask |= SND_VOLUME;
-       if (attenuation != DEFAULT_SOUND_PACKET_ATTENUATION)
-               field_mask |= SND_ATTENUATION;
-       if (speed4000 && speed4000 != 4000)
-               field_mask |= SND_SPEEDUSHORT4000;
-       if (ent >= 8192 || channel < 0 || channel > 7)
-               field_mask |= SND_LARGEENTITY;
-       if (sound_num >= 256)
-               field_mask |= SND_LARGESOUND;
-
-// directed messages go only to the entity they are targeted on
-       MSG_WriteByte (dest, svc_sound);
-       MSG_WriteByte (dest, field_mask);
-       if (field_mask & SND_VOLUME)
-               MSG_WriteByte (dest, nvolume);
-       if (field_mask & SND_ATTENUATION)
-               MSG_WriteByte (dest, (int)(attenuation*64));
-       if (field_mask & SND_SPEEDUSHORT4000)
-               MSG_WriteShort (dest, speed4000);
-       if (field_mask & SND_LARGEENTITY)
-       {
-               MSG_WriteShort (dest, ent);
-               MSG_WriteChar (dest, channel);
-       }
-       else
-               MSG_WriteShort (dest, (ent<<3) | channel);
-       if ((field_mask & SND_LARGESOUND) || sv.protocol == PROTOCOL_NEHAHRABJP2)
-               MSG_WriteShort (dest, sound_num);
-       else
-               MSG_WriteByte (dest, sound_num);
-       for (i = 0;i < 3;i++)
-               MSG_WriteCoord (dest, PRVM_serveredictvector(entity, origin)[i]+0.5*(PRVM_serveredictvector(entity, mins)[i]+PRVM_serveredictvector(entity, maxs)[i]), sv.protocol);
-
-       // TODO do we have to do anything here when dest is &sv.reliable_datagram?
-       if(!reliable)
-               SV_FlushBroadcastMessages();
-}
-
-/*
-==================
-SV_StartPointSound
-
-Nearly the same logic as SV_StartSound, except an origin
-instead of an entity is provided and channel is omitted.
-
-The entity sent to the client is 0 (world) and the channel
-is 0 (CHAN_AUTO).  SND_LARGEENTITY will never occur in this
-function, therefore the check for it is omitted.
-
-==================
-*/
-void SV_StartPointSound (vec3_t origin, const char *sample, int nvolume, float attenuation, float speed)
-{
-       int sound_num, field_mask, i, speed4000;
-
-       if (nvolume < 0 || nvolume > 255)
-       {
-               Con_Printf ("SV_StartPointSound: volume = %i\n", nvolume);
-               return;
-       }
-
-       if (attenuation < 0 || attenuation > 4)
-       {
-               Con_Printf ("SV_StartPointSound: attenuation = %f\n", attenuation);
-               return;
-       }
-
-       if (sv.datagram.cursize > MAX_PACKETFRAGMENT-21)
-               return;
-
-       // find precache number for sound
-       sound_num = SV_SoundIndex(sample, 1);
-       if (!sound_num)
-               return;
-
-       speed4000 = (int)(speed * 40.0f);
-       field_mask = 0;
-       if (nvolume != DEFAULT_SOUND_PACKET_VOLUME)
-               field_mask |= SND_VOLUME;
-       if (attenuation != DEFAULT_SOUND_PACKET_ATTENUATION)
-               field_mask |= SND_ATTENUATION;
-       if (sound_num >= 256)
-               field_mask |= SND_LARGESOUND;
-       if (speed4000 && speed4000 != 4000)
-               field_mask |= SND_SPEEDUSHORT4000;
-
-// directed messages go only to the entity they are targeted on
-       MSG_WriteByte (&sv.datagram, svc_sound);
-       MSG_WriteByte (&sv.datagram, field_mask);
-       if (field_mask & SND_VOLUME)
-               MSG_WriteByte (&sv.datagram, nvolume);
-       if (field_mask & SND_ATTENUATION)
-               MSG_WriteByte (&sv.datagram, (int)(attenuation*64));
-       if (field_mask & SND_SPEEDUSHORT4000)
-               MSG_WriteShort (&sv.datagram, speed4000);
-       // Always write entnum 0 for the world entity
-       MSG_WriteShort (&sv.datagram, (0<<3) | 0);
-       if (field_mask & SND_LARGESOUND)
-               MSG_WriteShort (&sv.datagram, sound_num);
-       else
-               MSG_WriteByte (&sv.datagram, sound_num);
-       for (i = 0;i < 3;i++)
-               MSG_WriteCoord (&sv.datagram, origin[i], sv.protocol);
-       SV_FlushBroadcastMessages();
-}
-
 /*
 ==============================================================================
 
@@ -1066,1708 +891,241 @@ void SV_SendServerinfo (client_t *client)
        client->movesequence = 0;
        client->movement_highestsequence_seen = 0;
        memset(&client->movement_count, 0, sizeof(client->movement_count));
-#ifdef NUM_PING_TIMES
-       for (i = 0;i < NUM_PING_TIMES;i++)
-               client->ping_times[i] = 0;
-       client->num_pings = 0;
-#endif
-       client->ping = 0;
-
-       // allow the client some time to send his keepalives, even if map loading took ages
-       client->netconnection->timeout = host.realtime + net_connecttimeout.value;
-}
-
-/*
-================
-SV_ConnectClient
-
-Initializes a client_t for a new net connection.  This will only be called
-once for a player each game, not once for each level change.
-================
-*/
-void SV_ConnectClient (int clientnum, netconn_t *netconnection)
-{
-       prvm_prog_t *prog = SVVM_prog;
-       client_t                *client;
-       int                             i;
-
-       client = svs.clients + clientnum;
-
-// set up the client_t
-       if (sv.loadgame)
-       {
-               float backupparms[NUM_SPAWN_PARMS];
-               memcpy(backupparms, client->spawn_parms, sizeof(backupparms));
-               memset(client, 0, sizeof(*client));
-               memcpy(client->spawn_parms, backupparms, sizeof(backupparms));
-       }
-       else
-               memset(client, 0, sizeof(*client));
-       client->active = true;
-       client->netconnection = netconnection;
-
-       Con_DPrintf("Client %s connected\n", client->netconnection ? client->netconnection->address : "botclient");
-
-       if(client->netconnection && client->netconnection->crypto.authenticated)
-       {
-               Con_Printf("%s connection to %s has been established: client is %s@%s%.*s, I am %.*s@%s%.*s\n",
-                               client->netconnection->crypto.use_aes ? "Encrypted" : "Authenticated",
-                               client->netconnection->address,
-                               client->netconnection->crypto.client_idfp[0] ? client->netconnection->crypto.client_idfp : "-",
-                               (client->netconnection->crypto.client_issigned || !client->netconnection->crypto.client_keyfp[0]) ? "" : "~",
-                               crypto_keyfp_recommended_length, client->netconnection->crypto.client_keyfp[0] ? client->netconnection->crypto.client_keyfp : "-",
-                               crypto_keyfp_recommended_length, client->netconnection->crypto.server_idfp[0] ? client->netconnection->crypto.server_idfp : "-",
-                               (client->netconnection->crypto.server_issigned || !client->netconnection->crypto.server_keyfp[0]) ? "" : "~",
-                               crypto_keyfp_recommended_length, client->netconnection->crypto.server_keyfp[0] ? client->netconnection->crypto.server_keyfp : "-"
-                               );
-       }
-
-       strlcpy(client->name, "unconnected", sizeof(client->name));
-       strlcpy(client->old_name, "unconnected", sizeof(client->old_name));
-       client->prespawned = false;
-       client->spawned = false;
-       client->begun = false;
-       client->edict = PRVM_EDICT_NUM(clientnum+1);
-       if (client->netconnection)
-               client->netconnection->message.allowoverflow = true;            // we can catch it
-       // prepare the unreliable message buffer
-       client->unreliablemsg.data = client->unreliablemsg_data;
-       client->unreliablemsg.maxsize = sizeof(client->unreliablemsg_data);
-       // updated by receiving "rate" command from client, this is also the default if not using a DP client
-       client->rate = 1000000000;
-       client->connecttime = host.realtime;
-
-       if (!sv.loadgame)
-       {
-               // call the progs to get default spawn parms for the new client
-               // set self to world to intentionally cause errors with broken SetNewParms code in some mods
-               PRVM_serverglobalfloat(time) = sv.time;
-               PRVM_serverglobaledict(self) = 0;
-               prog->ExecuteProgram(prog, PRVM_serverfunction(SetNewParms), "QC function SetNewParms is missing");
-               for (i=0 ; i<NUM_SPAWN_PARMS ; i++)
-                       client->spawn_parms[i] = (&PRVM_serverglobalfloat(parm1))[i];
-
-               // set up the entity for this client (including .colormap, .team, etc)
-               PRVM_ED_ClearEdict(prog, client->edict);
-       }
-
-       // don't call SendServerinfo for a fresh botclient because its fields have
-       // not been set up by the qc yet
-       if (client->netconnection)
-               SV_SendServerinfo (client);
-       else
-               client->prespawned = client->spawned = client->begun = true;
-}
-
-/*
-=====================
-SV_DropClient
-
-Called when the player is getting totally kicked off the host
-if (crash = true), don't bother sending signofs
-=====================
-*/
-void SV_DropClient(qbool crash)
-{
-       prvm_prog_t *prog = SVVM_prog;
-       int i;
-       Con_Printf("Client \"%s\" dropped\n", host_client->name);
-
-       SV_StopDemoRecording(host_client);
-
-       // make sure edict is not corrupt (from a level change for example)
-       host_client->edict = PRVM_EDICT_NUM(host_client - svs.clients + 1);
-
-       if (host_client->netconnection)
-       {
-               // tell the client to be gone
-               if (!crash)
-               {
-                       // LadyHavoc: no opportunity for resending, so use unreliable 3 times
-                       unsigned char bufdata[8];
-                       sizebuf_t buf;
-                       memset(&buf, 0, sizeof(buf));
-                       buf.data = bufdata;
-                       buf.maxsize = sizeof(bufdata);
-                       MSG_WriteByte(&buf, svc_disconnect);
-                       NetConn_SendUnreliableMessage(host_client->netconnection, &buf, sv.protocol, 10000, 0, false);
-                       NetConn_SendUnreliableMessage(host_client->netconnection, &buf, sv.protocol, 10000, 0, false);
-                       NetConn_SendUnreliableMessage(host_client->netconnection, &buf, sv.protocol, 10000, 0, false);
-               }
-       }
-
-       // call qc ClientDisconnect function
-       // LadyHavoc: don't call QC if server is dead (avoids recursive
-       // Host_Error in some mods when they run out of edicts)
-       if (host_client->clientconnectcalled && sv.active && host_client->edict)
-       {
-               // call the prog function for removing a client
-               // this will set the body to a dead frame, among other things
-               int saveSelf = PRVM_serverglobaledict(self);
-               host_client->clientconnectcalled = false;
-               PRVM_serverglobalfloat(time) = sv.time;
-               PRVM_serverglobaledict(self) = PRVM_EDICT_TO_PROG(host_client->edict);
-               prog->ExecuteProgram(prog, PRVM_serverfunction(ClientDisconnect), "QC function ClientDisconnect is missing");
-               PRVM_serverglobaledict(self) = saveSelf;
-       }
-
-       if (host_client->netconnection)
-       {
-               // break the net connection
-               NetConn_Close(host_client->netconnection);
-               host_client->netconnection = NULL;
-       }
-
-       // if a download is active, close it
-       if (host_client->download_file)
-       {
-               Con_DPrintf("Download of %s aborted when %s dropped\n", host_client->download_name, host_client->name);
-               FS_Close(host_client->download_file);
-               host_client->download_file = NULL;
-               host_client->download_name[0] = 0;
-               host_client->download_expectedposition = 0;
-               host_client->download_started = false;
-       }
-
-       // remove leaving player from scoreboard
-       host_client->name[0] = 0;
-       host_client->colors = 0;
-       host_client->frags = 0;
-       // send notification to all clients
-       // get number of client manually just to make sure we get it right...
-       i = host_client - svs.clients;
-       MSG_WriteByte (&sv.reliable_datagram, svc_updatename);
-       MSG_WriteByte (&sv.reliable_datagram, i);
-       MSG_WriteString (&sv.reliable_datagram, host_client->name);
-       MSG_WriteByte (&sv.reliable_datagram, svc_updatecolors);
-       MSG_WriteByte (&sv.reliable_datagram, i);
-       MSG_WriteByte (&sv.reliable_datagram, host_client->colors);
-       MSG_WriteByte (&sv.reliable_datagram, svc_updatefrags);
-       MSG_WriteByte (&sv.reliable_datagram, i);
-       MSG_WriteShort (&sv.reliable_datagram, host_client->frags);
-
-       // free the client now
-       if (host_client->entitydatabase)
-               EntityFrame_FreeDatabase(host_client->entitydatabase);
-       if (host_client->entitydatabase4)
-               EntityFrame4_FreeDatabase(host_client->entitydatabase4);
-       if (host_client->entitydatabase5)
-               EntityFrame5_FreeDatabase(host_client->entitydatabase5);
-
-       if (sv.active)
-       {
-               // clear a fields that matter to DP_SV_CLIENTNAME and DP_SV_CLIENTCOLORS, and also frags
-               PRVM_ED_ClearEdict(prog, host_client->edict);
-       }
-
-       // clear the client struct (this sets active to false)
-       memset(host_client, 0, sizeof(*host_client));
-
-       // update server listing on the master because player count changed
-       // (which the master uses for filtering empty/full servers)
-       NetConn_Heartbeat(1);
-
-       if (sv.loadgame)
-       {
-               for (i = 0;i < svs.maxclients;i++)
-                       if (svs.clients[i].active && !svs.clients[i].spawned)
-                               break;
-               if (i == svs.maxclients)
-               {
-                       Con_Printf("Loaded game, everyone rejoined - unpausing\n");
-                       sv.paused = sv.loadgame = false; // we're basically done with loading now
-               }
-       }
-}
-
-/*
-===============================================================================
-
-FRAME UPDATES
-
-===============================================================================
-*/
-
-/*
-=============================================================================
-
-The PVS must include a small area around the client to allow head bobbing
-or other small motion on the client side.  Otherwise, a bob might cause an
-entity that should be visible to not show up, especially when the bob
-crosses a waterline.
-
-=============================================================================
-*/
-
-static qbool SV_PrepareEntityForSending (prvm_edict_t *ent, entity_state_t *cs, int enumber)
-{
-       prvm_prog_t *prog = SVVM_prog;
-       int i;
-       unsigned int sendflags;
-       unsigned int version;
-       unsigned int modelindex, effects, flags, glowsize, lightstyle, lightpflags, light[4], specialvisibilityradius;
-       unsigned int customizeentityforclient;
-       unsigned int sendentity;
-       float f;
-       prvm_vec_t *v;
-       vec3_t cullmins, cullmaxs;
-       dp_model_t *model;
-
-       // fast path for games that do not use legacy entity networking
-       // note: still networks clients even if they are legacy
-       sendentity = PRVM_serveredictfunction(ent, SendEntity);
-       if (sv_onlycsqcnetworking.integer && !sendentity && enumber > svs.maxclients)
-               return false;
-
-       // this 2 billion unit check is actually to detect NAN origins
-       // (we really don't want to send those)
-       if (!(VectorLength2(PRVM_serveredictvector(ent, origin)) < 2000000000.0*2000000000.0))
-               return false;
-
-       // EF_NODRAW prevents sending for any reason except for your own
-       // client, so we must keep all clients in this superset
-       effects = (unsigned)PRVM_serveredictfloat(ent, effects);
-
-       // we can omit invisible entities with no effects that are not clients
-       // LadyHavoc: this could kill tags attached to an invisible entity, I
-       // just hope we never have to support that case
-       i = (int)PRVM_serveredictfloat(ent, modelindex);
-       modelindex = (i >= 1 && i < MAX_MODELS && PRVM_serveredictstring(ent, model) && *PRVM_GetString(prog, PRVM_serveredictstring(ent, model)) && sv.models[i]) ? i : 0;
-
-       flags = 0;
-       i = (int)(PRVM_serveredictfloat(ent, glow_size) * 0.25f);
-       glowsize = (unsigned char)bound(0, i, 255);
-       if (PRVM_serveredictfloat(ent, glow_trail))
-               flags |= RENDER_GLOWTRAIL;
-       if (PRVM_serveredictedict(ent, viewmodelforclient))
-               flags |= RENDER_VIEWMODEL;
-
-       v = PRVM_serveredictvector(ent, color);
-       f = v[0]*256;
-       light[0] = (unsigned short)bound(0, f, 65535);
-       f = v[1]*256;
-       light[1] = (unsigned short)bound(0, f, 65535);
-       f = v[2]*256;
-       light[2] = (unsigned short)bound(0, f, 65535);
-       f = PRVM_serveredictfloat(ent, light_lev);
-       light[3] = (unsigned short)bound(0, f, 65535);
-       lightstyle = (unsigned char)PRVM_serveredictfloat(ent, style);
-       lightpflags = (unsigned char)PRVM_serveredictfloat(ent, pflags);
-
-       if (gamemode == GAME_TENEBRAE)
-       {
-               // tenebrae's EF_FULLDYNAMIC conflicts with Q2's EF_NODRAW
-               if (effects & 16)
-               {
-                       effects &= ~16;
-                       lightpflags |= PFLAGS_FULLDYNAMIC;
-               }
-               // tenebrae's EF_GREEN conflicts with DP's EF_ADDITIVE
-               if (effects & 32)
-               {
-                       effects &= ~32;
-                       light[0] = (int)(0.2*256);
-                       light[1] = (int)(1.0*256);
-                       light[2] = (int)(0.2*256);
-                       light[3] = 200;
-                       lightpflags |= PFLAGS_FULLDYNAMIC;
-               }
-       }
-
-       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_serveredictfunction(ent, customizeentityforclient);
-       if (!customizeentityforclient && enumber > svs.maxclients && (!modelindex && !specialvisibilityradius))
-               return false;
-
-       *cs = defaultstate;
-       cs->active = ACTIVE_NETWORK;
-       cs->number = enumber;
-       VectorCopy(PRVM_serveredictvector(ent, origin), cs->origin);
-       VectorCopy(PRVM_serveredictvector(ent, angles), cs->angles);
-       cs->flags = flags;
-       cs->effects = effects;
-       cs->colormap = (unsigned)PRVM_serveredictfloat(ent, colormap);
-       cs->modelindex = modelindex;
-       cs->skin = (unsigned)PRVM_serveredictfloat(ent, skin);
-       cs->frame = (unsigned)PRVM_serveredictfloat(ent, frame);
-       cs->viewmodelforclient = PRVM_serveredictedict(ent, viewmodelforclient);
-       cs->exteriormodelforclient = PRVM_serveredictedict(ent, exteriormodeltoclient);
-       cs->nodrawtoclient = PRVM_serveredictedict(ent, nodrawtoclient);
-       cs->drawonlytoclient = PRVM_serveredictedict(ent, drawonlytoclient);
-       cs->customizeentityforclient = customizeentityforclient;
-       cs->tagentity = PRVM_serveredictedict(ent, tag_entity);
-       cs->tagindex = (unsigned char)PRVM_serveredictfloat(ent, tag_index);
-       cs->glowsize = glowsize;
-       cs->traileffectnum = PRVM_serveredictfloat(ent, traileffectnum);
-
-       // don't need to init cs->colormod because the defaultstate did that for us
-       //cs->colormod[0] = cs->colormod[1] = cs->colormod[2] = 32;
-       v = PRVM_serveredictvector(ent, colormod);
-       if (VectorLength2(v))
-       {
-               i = (int)(v[0] * 32.0f);cs->colormod[0] = bound(0, i, 255);
-               i = (int)(v[1] * 32.0f);cs->colormod[1] = bound(0, i, 255);
-               i = (int)(v[2] * 32.0f);cs->colormod[2] = bound(0, i, 255);
-       }
-
-       // don't need to init cs->glowmod because the defaultstate did that for us
-       //cs->glowmod[0] = cs->glowmod[1] = cs->glowmod[2] = 32;
-       v = PRVM_serveredictvector(ent, glowmod);
-       if (VectorLength2(v))
-       {
-               i = (int)(v[0] * 32.0f);cs->glowmod[0] = bound(0, i, 255);
-               i = (int)(v[1] * 32.0f);cs->glowmod[1] = bound(0, i, 255);
-               i = (int)(v[2] * 32.0f);cs->glowmod[2] = bound(0, i, 255);
-       }
-
-       cs->modelindex = modelindex;
-
-       cs->alpha = 255;
-       f = (PRVM_serveredictfloat(ent, alpha) * 255.0f);
-       if (f)
-       {
-               i = (int)f;
-               cs->alpha = (unsigned char)bound(0, i, 255);
-       }
-       // halflife
-       f = (PRVM_serveredictfloat(ent, renderamt));
-       if (f)
-       {
-               i = (int)f;
-               cs->alpha = (unsigned char)bound(0, i, 255);
-       }
-
-       cs->scale = 16;
-       f = (PRVM_serveredictfloat(ent, scale) * 16.0f);
-       if (f)
-       {
-               i = (int)f;
-               cs->scale = (unsigned char)bound(0, i, 255);
-       }
-
-       cs->glowcolor = 254;
-       f = PRVM_serveredictfloat(ent, glow_color);
-       if (f)
-               cs->glowcolor = (int)f;
-
-       if (PRVM_serveredictfloat(ent, fullbright))
-               cs->effects |= EF_FULLBRIGHT;
-
-       f = PRVM_serveredictfloat(ent, modelflags);
-       if (f)
-               cs->effects |= ((unsigned int)f & 0xff) << 24;
-
-       if (PRVM_serveredictfloat(ent, movetype) == MOVETYPE_STEP)
-               cs->flags |= RENDER_STEP;
-       if (cs->number != sv.writeentitiestoclient_cliententitynumber && (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 (PRVM_serveredictfloat(ent, colormap) >= 1024)
-               cs->flags |= RENDER_COLORMAPPED;
-       if (cs->viewmodelforclient)
-               cs->flags |= RENDER_VIEWMODEL; // show relative to the view
-
-       if (PRVM_serveredictfloat(ent, sendcomplexanimation))
-       {
-               cs->flags |= RENDER_COMPLEXANIMATION;
-               if (PRVM_serveredictfloat(ent, skeletonindex) >= 1)
-                       cs->skeletonobject = ent->priv.server->skeleton;
-               cs->framegroupblend[0].frame = PRVM_serveredictfloat(ent, frame);
-               cs->framegroupblend[1].frame = PRVM_serveredictfloat(ent, frame2);
-               cs->framegroupblend[2].frame = PRVM_serveredictfloat(ent, frame3);
-               cs->framegroupblend[3].frame = PRVM_serveredictfloat(ent, frame4);
-               cs->framegroupblend[0].start = PRVM_serveredictfloat(ent, frame1time);
-               cs->framegroupblend[1].start = PRVM_serveredictfloat(ent, frame2time);
-               cs->framegroupblend[2].start = PRVM_serveredictfloat(ent, frame3time);
-               cs->framegroupblend[3].start = PRVM_serveredictfloat(ent, frame4time);
-               cs->framegroupblend[1].lerp = PRVM_serveredictfloat(ent, lerpfrac);
-               cs->framegroupblend[2].lerp = PRVM_serveredictfloat(ent, lerpfrac3);
-               cs->framegroupblend[3].lerp = PRVM_serveredictfloat(ent, lerpfrac4);
-               cs->framegroupblend[0].lerp = 1.0f - cs->framegroupblend[1].lerp - cs->framegroupblend[2].lerp - cs->framegroupblend[3].lerp;
-               cs->frame = 0; // don't need the legacy frame
-       }
-
-       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_GetModelByIndex(modelindex)) && (model->type != mod_null))
-       {
-               float scale = cs->scale * (1.0f / 16.0f);
-               if (cs->angles[0] || cs->angles[2]) // pitch and roll
-               {
-                       VectorMA(cs->origin, scale, model->rotatedmins, cullmins);
-                       VectorMA(cs->origin, scale, model->rotatedmaxs, cullmaxs);
-               }
-               else if (cs->angles[1] || ((effects | model->effects) & EF_ROTATE))
-               {
-                       VectorMA(cs->origin, scale, model->yawmins, cullmins);
-                       VectorMA(cs->origin, scale, model->yawmaxs, cullmaxs);
-               }
-               else
-               {
-                       VectorMA(cs->origin, scale, model->normalmins, cullmins);
-                       VectorMA(cs->origin, scale, model->normalmaxs, cullmaxs);
-               }
-       }
-       else
-       {
-               // if there is no model (or it could not be loaded), use the physics box
-               VectorAdd(cs->origin, PRVM_serveredictvector(ent, mins), cullmins);
-               VectorAdd(cs->origin, PRVM_serveredictvector(ent, maxs), cullmaxs);
-       }
-       if (specialvisibilityradius)
-       {
-               cullmins[0] = min(cullmins[0], cs->origin[0] - specialvisibilityradius);
-               cullmins[1] = min(cullmins[1], cs->origin[1] - specialvisibilityradius);
-               cullmins[2] = min(cullmins[2], cs->origin[2] - specialvisibilityradius);
-               cullmaxs[0] = max(cullmaxs[0], cs->origin[0] + specialvisibilityradius);
-               cullmaxs[1] = max(cullmaxs[1], cs->origin[1] + specialvisibilityradius);
-               cullmaxs[2] = max(cullmaxs[2], cs->origin[2] + specialvisibilityradius);
-       }
-
-       // calculate center of bbox for network prioritization purposes
-       VectorMAM(0.5f, cullmins, 0.5f, cullmaxs, cs->netcenter);
-
-       // if culling box has moved, update pvs cluster links
-       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);
-               // a value of -1 for pvs_numclusters indicates that the links are not
-               // cached, and should be re-tested each time, this is the case if the
-               // culling box touches too many pvs clusters to store, or if the world
-               // model does not support FindBoxClusters
-               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;
-               }
-       }
-
-       // we need to do some csqc entity upkeep here
-       // get self.SendFlags and clear them
-       // (to let the QC know that they've been read)
-       if (sendentity)
-       {
-               sendflags = (unsigned int)PRVM_serveredictfloat(ent, SendFlags);
-               PRVM_serveredictfloat(ent, SendFlags) = 0;
-               // legacy self.Version system
-               if ((version = (unsigned int)PRVM_serveredictfloat(ent, Version)))
-               {
-                       if (sv.csqcentityversion[enumber] != version)
-                               sendflags = 0xFFFFFF;
-                       sv.csqcentityversion[enumber] = version;
-               }
-               // move sendflags into the per-client sendflags
-               if (sendflags)
-                       for (i = 0;i < svs.maxclients;i++)
-                               svs.clients[i].csqcentitysendflags[enumber] |= sendflags;
-               // mark it as inactive for non-csqc networking
-               cs->active = ACTIVE_SHARED;
-       }
-
-       return true;
-}
-
-static void SV_PrepareEntitiesForSending(void)
-{
-       prvm_prog_t *prog = SVVM_prog;
-       int e;
-       prvm_edict_t *ent;
-       // send all entities that touch the pvs
-       sv.numsendentities = 0;
-       sv.sendentitiesindex[0] = NULL;
-       memset(sv.sendentitiesindex, 0, prog->num_edicts * sizeof(*sv.sendentitiesindex));
-       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, sv.sendentities + sv.numsendentities, e))
-               {
-                       sv.sendentitiesindex[e] = sv.sendentities + sv.numsendentities;
-                       sv.numsendentities++;
-               }
-       }
-}
-
-#define MAX_LINEOFSIGHTTRACES 64
-
-qbool SV_CanSeeBox(int numtraces, vec_t eyejitter, vec_t enlarge, vec_t entboxexpand, vec3_t eye, vec3_t entboxmins, vec3_t entboxmaxs)
-{
-       prvm_prog_t *prog = SVVM_prog;
-       float pitchsign;
-       float alpha;
-       float starttransformed[3], endtransformed[3];
-       float boxminstransformed[3], boxmaxstransformed[3];
-       float localboxcenter[3], localboxextents[3], localboxmins[3], localboxmaxs[3];
-       int blocked = 0;
-       int traceindex;
-       int originalnumtouchedicts;
-       int numtouchedicts = 0;
-       int touchindex;
-       matrix4x4_t matrix, imatrix;
-       dp_model_t *model;
-       prvm_edict_t *touch;
-       static prvm_edict_t *touchedicts[MAX_EDICTS];
-       vec3_t eyemins, eyemaxs, start;
-       vec3_t boxmins, boxmaxs;
-       vec3_t clipboxmins, clipboxmaxs;
-       vec3_t endpoints[MAX_LINEOFSIGHTTRACES];
-
-       numtraces = min(numtraces, MAX_LINEOFSIGHTTRACES);
-
-       // jitter the eye location within this box
-       eyemins[0] = eye[0] - eyejitter;
-       eyemaxs[0] = eye[0] + eyejitter;
-       eyemins[1] = eye[1] - eyejitter;
-       eyemaxs[1] = eye[1] + eyejitter;
-       eyemins[2] = eye[2] - eyejitter;
-       eyemaxs[2] = eye[2] + eyejitter;
-       // expand the box a little
-       boxmins[0] = (enlarge+1) * entboxmins[0] - enlarge * entboxmaxs[0] - entboxexpand;
-       boxmaxs[0] = (enlarge+1) * entboxmaxs[0] - enlarge * entboxmins[0] + entboxexpand;
-       boxmins[1] = (enlarge+1) * entboxmins[1] - enlarge * entboxmaxs[1] - entboxexpand;
-       boxmaxs[1] = (enlarge+1) * entboxmaxs[1] - enlarge * entboxmins[1] + entboxexpand;
-       boxmins[2] = (enlarge+1) * entboxmins[2] - enlarge * entboxmaxs[2] - entboxexpand;
-       boxmaxs[2] = (enlarge+1) * entboxmaxs[2] - enlarge * entboxmins[2] + entboxexpand;
-
-       VectorMAM(0.5f, boxmins, 0.5f, boxmaxs, endpoints[0]);
-       for (traceindex = 1;traceindex < numtraces;traceindex++)
-               VectorSet(endpoints[traceindex], lhrandom(boxmins[0], boxmaxs[0]), lhrandom(boxmins[1], boxmaxs[1]), lhrandom(boxmins[2], boxmaxs[2]));
-
-       // calculate sweep box for the entire swarm of traces
-       VectorCopy(eyemins, clipboxmins);
-       VectorCopy(eyemaxs, clipboxmaxs);
-       for (traceindex = 0;traceindex < numtraces;traceindex++)
-       {
-               clipboxmins[0] = min(clipboxmins[0], endpoints[traceindex][0]);
-               clipboxmins[1] = min(clipboxmins[1], endpoints[traceindex][1]);
-               clipboxmins[2] = min(clipboxmins[2], endpoints[traceindex][2]);
-               clipboxmaxs[0] = max(clipboxmaxs[0], endpoints[traceindex][0]);
-               clipboxmaxs[1] = max(clipboxmaxs[1], endpoints[traceindex][1]);
-               clipboxmaxs[2] = max(clipboxmaxs[2], endpoints[traceindex][2]);
-       }
-
-       // get the list of entities in the sweep box
-       if (sv_cullentities_trace_entityocclusion.integer)
-               numtouchedicts = SV_EntitiesInBox(clipboxmins, clipboxmaxs, MAX_EDICTS, touchedicts);
-       if (numtouchedicts > MAX_EDICTS)
-       {
-               // this never happens
-               Con_Printf("SV_EntitiesInBox returned %i edicts, max was %i\n", numtouchedicts, MAX_EDICTS);
-               numtouchedicts = MAX_EDICTS;
-       }
-       // iterate the entities found in the sweep box and filter them
-       originalnumtouchedicts = numtouchedicts;
-       numtouchedicts = 0;
-       for (touchindex = 0;touchindex < originalnumtouchedicts;touchindex++)
-       {
-               touch = touchedicts[touchindex];
-               if (PRVM_serveredictfloat(touch, solid) != SOLID_BSP)
-                       continue;
-               model = SV_GetModelFromEdict(touch);
-               if (!model || !model->brush.TraceLineOfSight)
-                       continue;
-               // skip obviously transparent entities
-               alpha = PRVM_serveredictfloat(touch, alpha);
-               if (alpha && alpha < 1)
-                       continue;
-               if ((int)PRVM_serveredictfloat(touch, effects) & EF_ADDITIVE)
-                       continue;
-               touchedicts[numtouchedicts++] = touch;
-       }
-
-       // now that we have a filtered list of "interesting" entities, fire each
-       // ray against all of them, this gives us an early-out case when something
-       // is visible (which it often is)
-
-       for (traceindex = 0;traceindex < numtraces;traceindex++)
-       {
-               VectorSet(start, lhrandom(eyemins[0], eyemaxs[0]), lhrandom(eyemins[1], eyemaxs[1]), lhrandom(eyemins[2], eyemaxs[2]));
-               // check world occlusion
-               if (sv.worldmodel && sv.worldmodel->brush.TraceLineOfSight)
-                       if (!sv.worldmodel->brush.TraceLineOfSight(sv.worldmodel, start, endpoints[traceindex], boxmins, boxmaxs))
-                               continue;
-               for (touchindex = 0;touchindex < numtouchedicts;touchindex++)
-               {
-                       touch = touchedicts[touchindex];
-                       model = SV_GetModelFromEdict(touch);
-                       if(model && model->brush.TraceLineOfSight)
-                       {
-                               // get the entity matrix
-                               pitchsign = SV_GetPitchSign(prog, touch);
-                               Matrix4x4_CreateFromQuakeEntity(&matrix, PRVM_serveredictvector(touch, origin)[0], PRVM_serveredictvector(touch, origin)[1], PRVM_serveredictvector(touch, origin)[2], pitchsign * PRVM_serveredictvector(touch, angles)[0], PRVM_serveredictvector(touch, angles)[1], PRVM_serveredictvector(touch, angles)[2], 1);
-                               Matrix4x4_Invert_Simple(&imatrix, &matrix);
-                               // see if the ray hits this entity
-                               Matrix4x4_Transform(&imatrix, start, starttransformed);
-                               Matrix4x4_Transform(&imatrix, endpoints[traceindex], endtransformed);
-                               Matrix4x4_Transform(&imatrix, boxmins, boxminstransformed);
-                               Matrix4x4_Transform(&imatrix, boxmaxs, boxmaxstransformed);
-                               // transform the AABB to local space
-                               VectorMAM(0.5f, boxminstransformed, 0.5f, boxmaxstransformed, localboxcenter);
-                               localboxextents[0] = fabs(boxmaxstransformed[0] - localboxcenter[0]);
-                               localboxextents[1] = fabs(boxmaxstransformed[1] - localboxcenter[1]);
-                               localboxextents[2] = fabs(boxmaxstransformed[2] - localboxcenter[2]);
-                               localboxmins[0] = localboxcenter[0] - localboxextents[0];
-                               localboxmins[1] = localboxcenter[1] - localboxextents[1];
-                               localboxmins[2] = localboxcenter[2] - localboxextents[2];
-                               localboxmaxs[0] = localboxcenter[0] + localboxextents[0];
-                               localboxmaxs[1] = localboxcenter[1] + localboxextents[1];
-                               localboxmaxs[2] = localboxcenter[2] + localboxextents[2];
-                               if (!model->brush.TraceLineOfSight(model, starttransformed, endtransformed, localboxmins, localboxmaxs))
-                               {
-                                       blocked++;
-                                       break;
-                               }
-                       }
-               }
-               // check if the ray was blocked
-               if (touchindex < numtouchedicts)
-                       continue;
-               // return if the ray was not blocked
-               return true;
-       }
-
-       // no rays survived
-       return false;
-}
-
-static void SV_MarkWriteEntityStateToClient(entity_state_t *s)
-{
-       prvm_prog_t *prog = SVVM_prog;
-       int isbmodel;
-       dp_model_t *model;
-       prvm_edict_t *ed;
-       if (sv.sententitiesconsideration[s->number] == sv.sententitiesmark)
-               return;
-       sv.sententitiesconsideration[s->number] = sv.sententitiesmark;
-       sv.writeentitiestoclient_stats_totalentities++;
-
-       if (s->customizeentityforclient)
-       {
-               PRVM_serverglobalfloat(time) = sv.time;
-               PRVM_serverglobaledict(self) = s->number;
-               PRVM_serverglobaledict(other) = sv.writeentitiestoclient_cliententitynumber;
-               prog->ExecuteProgram(prog, s->customizeentityforclient, "customizeentityforclient: NULL function");
-               if(!PRVM_G_FLOAT(OFS_RETURN) || !SV_PrepareEntityForSending(PRVM_EDICT_NUM(s->number), s, s->number))
-                       return;
-       }
-
-       // never reject player
-       if (s->number != sv.writeentitiestoclient_cliententitynumber)
-       {
-               // check various rejection conditions
-               if (s->nodrawtoclient == sv.writeentitiestoclient_cliententitynumber)
-                       return;
-               if (s->drawonlytoclient && s->drawonlytoclient != sv.writeentitiestoclient_cliententitynumber)
-                       return;
-               if (s->effects & EF_NODRAW)
-                       return;
-               // LadyHavoc: only send entities with a model or important effects
-               if (!s->modelindex && s->specialvisibilityradius == 0)
-                       return;
-
-               isbmodel = (model = SV_GetModelByIndex(s->modelindex)) != NULL && model->name[0] == '*';
-               // viewmodels don't have visibility checking
-               if (s->viewmodelforclient)
-               {
-                       if (s->viewmodelforclient != sv.writeentitiestoclient_cliententitynumber)
-                               return;
-               }
-               else if (s->tagentity)
-               {
-                       // tag attached entities simply check their parent
-                       if (!sv.sendentitiesindex[s->tagentity])
-                               return;
-                       SV_MarkWriteEntityStateToClient(sv.sendentitiesindex[s->tagentity]);
-                       if (sv.sententities[s->tagentity] != sv.sententitiesmark)
-                               return;
-               }
-               // always send world submodels in newer protocols because they don't
-               // generate much traffic (in old protocols they hog bandwidth)
-               // but only if sv_cullentities_nevercullbmodels is off
-               else if (!(s->effects & EF_NODEPTHTEST) && (!isbmodel || !sv_cullentities_nevercullbmodels.integer || sv.protocol == PROTOCOL_QUAKE || sv.protocol == PROTOCOL_QUAKEDP || sv.protocol == PROTOCOL_NEHAHRAMOVIE))
-               {
-                       // entity has survived every check so far, check if visible
-                       ed = PRVM_EDICT_NUM(s->number);
-
-                       // if not touching a visible leaf
-                       if (sv_cullentities_pvs.integer && !r_novis.integer && !r_trippy.integer && sv.writeentitiestoclient_pvsbytes)
-                       {
-                               if (ed->priv.server->pvs_numclusters < 0)
-                               {
-                                       // entity too big for clusters list
-                                       if (sv.worldmodel && sv.worldmodel->brush.BoxTouchingPVS && !sv.worldmodel->brush.BoxTouchingPVS(sv.worldmodel, sv.writeentitiestoclient_pvs, ed->priv.server->cullmins, ed->priv.server->cullmaxs))
-                                       {
-                                               sv.writeentitiestoclient_stats_culled_pvs++;
-                                               return;
-                                       }
-                               }
-                               else
-                               {
-                                       int i;
-                                       // check cached clusters list
-                                       for (i = 0;i < ed->priv.server->pvs_numclusters;i++)
-                                               if (CHECKPVSBIT(sv.writeentitiestoclient_pvs, ed->priv.server->pvs_clusterlist[i]))
-                                                       break;
-                                       if (i == ed->priv.server->pvs_numclusters)
-                                       {
-                                               sv.writeentitiestoclient_stats_culled_pvs++;
-                                               return;
-                                       }
-                               }
-                       }
-
-                       // or not seen by random tracelines
-                       if (sv_cullentities_trace.integer && !isbmodel && sv.worldmodel && sv.worldmodel->brush.TraceLineOfSight && !r_trippy.integer)
-                       {
-                               int samples =
-                                       s->number <= svs.maxclients
-                                               ? sv_cullentities_trace_samples_players.integer
-                                               :
-                                       s->specialvisibilityradius
-                                               ? sv_cullentities_trace_samples_extra.integer
-                                               : sv_cullentities_trace_samples.integer;
-                               float enlarge = sv_cullentities_trace_enlarge.value;
-
-                               if(samples > 0)
-                               {
-                                       int eyeindex;
-                                       for (eyeindex = 0;eyeindex < sv.writeentitiestoclient_numeyes;eyeindex++)
-                                               if(SV_CanSeeBox(samples, sv_cullentities_trace_eyejitter.value, enlarge, sv_cullentities_trace_expand.value, sv.writeentitiestoclient_eyes[eyeindex], ed->priv.server->cullmins, ed->priv.server->cullmaxs))
-                                                       break;
-                                       if(eyeindex < sv.writeentitiestoclient_numeyes)
-                                               svs.clients[sv.writeentitiestoclient_clientnumber].visibletime[s->number] =
-                                                       host.realtime + (
-                                                               s->number <= svs.maxclients
-                                                                       ? sv_cullentities_trace_delay_players.value
-                                                                       : sv_cullentities_trace_delay.value
-                                                       );
-                                       else if (host.realtime > svs.clients[sv.writeentitiestoclient_clientnumber].visibletime[s->number])
-                                       {
-                                               sv.writeentitiestoclient_stats_culled_trace++;
-                                               return;
-                                       }
-                               }
-                       }
-               }
-       }
-
-       // 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_stats_visibleentities++;
-       sv.sententities[s->number] = sv.sententitiesmark;
-}
-
-#if MAX_LEVELNETWORKEYES > 0
-#define MAX_EYE_RECURSION 1 // increase if recursion gets supported by portals
-static void SV_AddCameraEyes(void)
-{
-       prvm_prog_t *prog = SVVM_prog;
-       int e, i, j, k;
-       prvm_edict_t *ed;
-       static int cameras[MAX_LEVELNETWORKEYES];
-       static vec3_t camera_origins[MAX_LEVELNETWORKEYES];
-       static int eye_levels[MAX_CLIENTNETWORKEYES];
-       int n_cameras = 0;
-       vec3_t mi, ma;
-
-       for(i = 0; i < sv.writeentitiestoclient_numeyes; ++i)
-               eye_levels[i] = 0;
-
-       // check line of sight to portal entities and add them to PVS
-       for (e = 1, ed = PRVM_NEXT_EDICT(prog->edicts);e < prog->num_edicts;e++, ed = PRVM_NEXT_EDICT(ed))
-       {
-               if (!ed->priv.server->free)
-               {
-                       if(PRVM_serveredictfunction(ed, camera_transform))
-                       {
-                               PRVM_serverglobalfloat(time) = sv.time;
-                               PRVM_serverglobaledict(self) = e;
-                               PRVM_serverglobaledict(other) = sv.writeentitiestoclient_cliententitynumber;
-                               VectorCopy(sv.writeentitiestoclient_eyes[0], PRVM_serverglobalvector(trace_endpos));
-                               VectorCopy(sv.writeentitiestoclient_eyes[0], PRVM_G_VECTOR(OFS_PARM0));
-                               VectorClear(PRVM_G_VECTOR(OFS_PARM1));
-                               prog->ExecuteProgram(prog, PRVM_serveredictfunction(ed, camera_transform), "QC function e.camera_transform is missing");
-                               if(!VectorCompare(PRVM_serverglobalvector(trace_endpos), sv.writeentitiestoclient_eyes[0]))
-                               {
-                                       VectorCopy(PRVM_serverglobalvector(trace_endpos), camera_origins[n_cameras]);
-                                       cameras[n_cameras] = e;
-                                       ++n_cameras;
-                                       if(n_cameras >= MAX_LEVELNETWORKEYES)
-                                               break;
-                               }
-                       }
-               }
-       }
-
-       if(!n_cameras)
-               return;
-
-       // i is loop counter, is reset to 0 when an eye got added
-       // j is camera index to check
-       for(i = 0, j = 0; sv.writeentitiestoclient_numeyes < MAX_CLIENTNETWORKEYES && i < n_cameras; ++i, ++j, j %= n_cameras)
-       {
-               if(!cameras[j])
-                       continue;
-               ed = PRVM_EDICT_NUM(cameras[j]);
-               VectorAdd(PRVM_serveredictvector(ed, origin), PRVM_serveredictvector(ed, mins), mi);
-               VectorAdd(PRVM_serveredictvector(ed, origin), PRVM_serveredictvector(ed, maxs), ma);
-               for(k = 0; k < sv.writeentitiestoclient_numeyes; ++k)
-               if(eye_levels[k] <= MAX_EYE_RECURSION)
-               {
-                       if(SV_CanSeeBox(sv_cullentities_trace_samples.integer, sv_cullentities_trace_eyejitter.value, sv_cullentities_trace_enlarge.value, sv_cullentities_trace_expand.value, sv.writeentitiestoclient_eyes[k], mi, ma))
-                       {
-                               eye_levels[sv.writeentitiestoclient_numeyes] = eye_levels[k] + 1;
-                               VectorCopy(camera_origins[j], sv.writeentitiestoclient_eyes[sv.writeentitiestoclient_numeyes]);
-                               // Con_Printf("added eye %d: %f %f %f because we can see %f %f %f .. %f %f %f from eye %d\n", j, sv.writeentitiestoclient_eyes[sv.writeentitiestoclient_numeyes][0], sv.writeentitiestoclient_eyes[sv.writeentitiestoclient_numeyes][1], sv.writeentitiestoclient_eyes[sv.writeentitiestoclient_numeyes][2], mi[0], mi[1], mi[2], ma[0], ma[1], ma[2], k);
-                               sv.writeentitiestoclient_numeyes++;
-                               cameras[j] = 0;
-                               i = 0;
-                               break;
-                       }
-               }
-       }
-}
-#else
-void SV_AddCameraEyes(void)
-{
-}
-#endif
-
-static void SV_WriteEntitiesToClient(client_t *client, prvm_edict_t *clent, sizebuf_t *msg, int maxsize)
-{
-       prvm_prog_t *prog = SVVM_prog;
-       qbool need_empty = false;
-       int i, numsendstates, numcsqcsendstates;
-       entity_state_t *s;
-       prvm_edict_t *camera;
-       qbool success;
-       vec3_t eye;
-
-       // if there isn't enough space to accomplish anything, skip it
-       if (msg->cursize + 25 > maxsize)
-               return;
-
-       sv.writeentitiestoclient_msg = msg;
-       sv.writeentitiestoclient_clientnumber = client - svs.clients;
-
-       sv.writeentitiestoclient_stats_culled_pvs = 0;
-       sv.writeentitiestoclient_stats_culled_trace = 0;
-       sv.writeentitiestoclient_stats_visibleentities = 0;
-       sv.writeentitiestoclient_stats_totalentities = 0;
-       sv.writeentitiestoclient_numeyes = 0;
-
-       // get eye location
-       sv.writeentitiestoclient_cliententitynumber = PRVM_EDICT_TO_PROG(clent); // LadyHavoc: for comparison purposes
-       camera = PRVM_EDICT_NUM( client->clientcamera );
-       VectorAdd(PRVM_serveredictvector(camera, origin), PRVM_serveredictvector(clent, view_ofs), eye);
-       sv.writeentitiestoclient_pvsbytes = 0;
-       // get the PVS values for the eye location, later FatPVS calls will merge
-       if (sv.worldmodel && sv.worldmodel->brush.FatPVS)
-               sv.writeentitiestoclient_pvsbytes = sv.worldmodel->brush.FatPVS(sv.worldmodel, eye, 8, sv.writeentitiestoclient_pvs, sizeof(sv.writeentitiestoclient_pvs), sv.writeentitiestoclient_pvsbytes != 0);
-
-       // add the eye to a list for SV_CanSeeBox tests
-       VectorCopy(eye, sv.writeentitiestoclient_eyes[sv.writeentitiestoclient_numeyes]);
-       sv.writeentitiestoclient_numeyes++;
-
-       // calculate predicted eye origin for SV_CanSeeBox tests
-       if (sv_cullentities_trace_prediction.integer)
-       {
-               vec_t predtime = bound(0, host_client->ping, sv_cullentities_trace_prediction_time.value);
-               vec3_t predeye;
-               VectorMA(eye, predtime, PRVM_serveredictvector(camera, velocity), predeye);
-               if (SV_CanSeeBox(1, 0, 0, 0, eye, predeye, predeye))
-               {
-                       VectorCopy(predeye, sv.writeentitiestoclient_eyes[sv.writeentitiestoclient_numeyes]);
-                       sv.writeentitiestoclient_numeyes++;
-               }
-               //if (!sv.writeentitiestoclient_useprediction)
-               //      Con_DPrintf("Trying to walk into solid in a pingtime... not predicting for culling\n");
-       }
-
-       SV_AddCameraEyes();
-
-       // build PVS from the new eyes
-       if (sv.worldmodel && sv.worldmodel->brush.FatPVS)
-               for(i = 1; i < sv.writeentitiestoclient_numeyes; ++i)
-                       sv.writeentitiestoclient_pvsbytes = sv.worldmodel->brush.FatPVS(sv.worldmodel, sv.writeentitiestoclient_eyes[i], 8, sv.writeentitiestoclient_pvs, sizeof(sv.writeentitiestoclient_pvs), sv.writeentitiestoclient_pvsbytes != 0);
-
-       sv.sententitiesmark++;
-
-       for (i = 0;i < sv.numsendentities;i++)
-               SV_MarkWriteEntityStateToClient(sv.sendentities + i);
-
-       numsendstates = 0;
-       numcsqcsendstates = 0;
-       for (i = 0;i < sv.numsendentities;i++)
-       {
-               s = &sv.sendentities[i];
-               if (sv.sententities[s->number] == sv.sententitiesmark)
-               {
-                       if(s->active == ACTIVE_NETWORK)
-                       {
-                               if (s->exteriormodelforclient)
-                               {
-                                       if (s->exteriormodelforclient == sv.writeentitiestoclient_cliententitynumber)
-                                               s->flags |= RENDER_EXTERIORMODEL;
-                                       else
-                                               s->flags &= ~RENDER_EXTERIORMODEL;
-                               }
-                               sv.writeentitiestoclient_sendstates[numsendstates++] = s;
-                       }
-                       else if(sv.sendentities[i].active == ACTIVE_SHARED)
-                               sv.writeentitiestoclient_csqcsendstates[numcsqcsendstates++] = s->number;
-                       else
-                               Con_Printf("entity %d is in sv.sendentities and marked, but not active, please breakpoint me\n", s->number);
-               }
-       }
-
-       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_stats_totalentities, sv.writeentitiestoclient_stats_visibleentities, sv.writeentitiestoclient_stats_culled_pvs + sv.writeentitiestoclient_stats_culled_trace, sv.writeentitiestoclient_stats_culled_pvs, sv.writeentitiestoclient_stats_culled_trace);
-
-       if(client->entitydatabase5)
-               need_empty = EntityFrameCSQC_WriteFrame(msg, maxsize, numcsqcsendstates, sv.writeentitiestoclient_csqcsendstates, client->entitydatabase5->latestframenum + 1);
-       else
-               EntityFrameCSQC_WriteFrame(msg, maxsize, numcsqcsendstates, sv.writeentitiestoclient_csqcsendstates, 0);
-
-       // force every 16th frame to be not empty (or cl_movement replay takes
-       // too long)
-       // BTW, this should normally not kick in any more due to the check
-       // below, except if the client stopped sending movement frames
-       if(client->num_skippedentityframes >= 16)
-               need_empty = true;
-
-       // help cl_movement a bit more
-       if(client->movesequence != client->lastmovesequence)
-               need_empty = true;
-       client->lastmovesequence = client->movesequence;
-
-       if (client->entitydatabase5)
-               success = EntityFrame5_WriteFrame(msg, maxsize, client->entitydatabase5, numsendstates, sv.writeentitiestoclient_sendstates, client - svs.clients + 1, client->movesequence, need_empty);
-       else if (client->entitydatabase4)
-       {
-               success = EntityFrame4_WriteFrame(msg, maxsize, client->entitydatabase4, numsendstates, sv.writeentitiestoclient_sendstates);
-               Protocol_WriteStatsReliable();
-       }
-       else if (client->entitydatabase)
-       {
-               success = EntityFrame_WriteFrame(msg, maxsize, client->entitydatabase, numsendstates, sv.writeentitiestoclient_sendstates, client - svs.clients + 1);
-               Protocol_WriteStatsReliable();
-       }
-       else
-       {
-               success = EntityFrameQuake_WriteFrame(msg, maxsize, numsendstates, sv.writeentitiestoclient_sendstates);
-               Protocol_WriteStatsReliable();
-       }
-
-       if(success)
-               client->num_skippedentityframes = 0;
-       else
-               ++client->num_skippedentityframes;
-}
-
-/*
-=============
-SV_CleanupEnts
-
-=============
-*/
-static void SV_CleanupEnts (void)
-{
-       prvm_prog_t *prog = SVVM_prog;
-       int             e;
-       prvm_edict_t    *ent;
-
-       ent = PRVM_NEXT_EDICT(prog->edicts);
-       for (e=1 ; e<prog->num_edicts ; e++, ent = PRVM_NEXT_EDICT(ent))
-               PRVM_serveredictfloat(ent, effects) = (int)PRVM_serveredictfloat(ent, effects) & ~EF_MUZZLEFLASH;
-}
-
-/*
-==================
-SV_WriteClientdataToMessage
-
-==================
-*/
-void SV_WriteClientdataToMessage (client_t *client, prvm_edict_t *ent, sizebuf_t *msg, int *stats)
-{
-       prvm_prog_t *prog = SVVM_prog;
-       int             bits;
-       int             i;
-       prvm_edict_t    *other;
-       int             items;
-       vec3_t  punchvector;
-       int             viewzoom;
-       const char *s;
-       float   *statsf = (float *)stats;
-       float gravity;
-
-//
-// send a damage message
-//
-       if (PRVM_serveredictfloat(ent, dmg_take) || PRVM_serveredictfloat(ent, dmg_save))
-       {
-               other = PRVM_PROG_TO_EDICT(PRVM_serveredictedict(ent, dmg_inflictor));
-               MSG_WriteByte (msg, svc_damage);
-               MSG_WriteByte (msg, (int)PRVM_serveredictfloat(ent, dmg_save));
-               MSG_WriteByte (msg, (int)PRVM_serveredictfloat(ent, dmg_take));
-               for (i=0 ; i<3 ; i++)
-                       MSG_WriteCoord (msg, PRVM_serveredictvector(other, origin)[i] + 0.5*(PRVM_serveredictvector(other, mins)[i] + PRVM_serveredictvector(other, maxs)[i]), sv.protocol);
-
-               PRVM_serveredictfloat(ent, dmg_take) = 0;
-               PRVM_serveredictfloat(ent, dmg_save) = 0;
-       }
-
-//
-// send the current viewpos offset from the view entity
-//
-       SV_SetIdealPitch ();            // how much to look up / down ideally
-
-// a fixangle might get lost in a dropped packet.  Oh well.
-       if(PRVM_serveredictfloat(ent, fixangle))
-       {
-               // angle fixing was requested by global thinking code...
-               // so store the current angles for later use
-               VectorCopy(PRVM_serveredictvector(ent, angles), host_client->fixangle_angles);
-               host_client->fixangle_angles_set = true;
-
-               // and clear fixangle for the next frame
-               PRVM_serveredictfloat(ent, fixangle) = 0;
-       }
-
-       if (host_client->fixangle_angles_set)
-       {
-               MSG_WriteByte (msg, svc_setangle);
-               for (i=0 ; i < 3 ; i++)
-                       MSG_WriteAngle (msg, host_client->fixangle_angles[i], sv.protocol);
-               host_client->fixangle_angles_set = false;
-       }
-
-       // the runes are in serverflags, pack them into the items value, also pack
-       // in the items2 value for mission pack huds
-       // (used only in the mission packs, which do not use serverflags)
-       items = (int)PRVM_serveredictfloat(ent, items) | ((int)PRVM_serveredictfloat(ent, items2) << 23) | ((int)PRVM_serverglobalfloat(serverflags) << 28);
-
-       VectorCopy(PRVM_serveredictvector(ent, punchvector), punchvector);
-
-       // cache weapon model name and index in client struct to save time
-       // (this search can be almost 1% of cpu time!)
-       s = PRVM_GetString(prog, PRVM_serveredictstring(ent, weaponmodel));
-       if (strcmp(s, client->weaponmodel))
-       {
-               strlcpy(client->weaponmodel, s, sizeof(client->weaponmodel));
-               client->weaponmodelindex = SV_ModelIndex(s, 1);
-       }
-
-       viewzoom = (int)(PRVM_serveredictfloat(ent, viewzoom) * 255.0f);
-       if (viewzoom == 0)
-               viewzoom = 255;
-
-       bits = 0;
-
-       if ((int)PRVM_serveredictfloat(ent, flags) & FL_ONGROUND)
-               bits |= SU_ONGROUND;
-       if (PRVM_serveredictfloat(ent, waterlevel) >= 2)
-               bits |= SU_INWATER;
-       if (PRVM_serveredictfloat(ent, idealpitch))
-               bits |= SU_IDEALPITCH;
-
-       for (i=0 ; i<3 ; i++)
-       {
-               if (PRVM_serveredictvector(ent, punchangle)[i])
-                       bits |= (SU_PUNCH1<<i);
-               if (sv.protocol != PROTOCOL_QUAKE && sv.protocol != PROTOCOL_QUAKEDP && sv.protocol != PROTOCOL_NEHAHRAMOVIE && sv.protocol != PROTOCOL_NEHAHRABJP && sv.protocol != PROTOCOL_NEHAHRABJP2 && sv.protocol != PROTOCOL_NEHAHRABJP3)
-                       if (punchvector[i])
-                               bits |= (SU_PUNCHVEC1<<i);
-               if (PRVM_serveredictvector(ent, velocity)[i])
-                       bits |= (SU_VELOCITY1<<i);
-       }
-
-       gravity = PRVM_serveredictfloat(ent, gravity);if (!gravity) gravity = 1.0f;
-
-       memset(stats, 0, sizeof(int[MAX_CL_STATS]));
-       stats[STAT_VIEWHEIGHT] = (int)PRVM_serveredictvector(ent, view_ofs)[2];
-       stats[STAT_ITEMS] = items;
-       stats[STAT_WEAPONFRAME] = (int)PRVM_serveredictfloat(ent, weaponframe);
-       stats[STAT_ARMOR] = (int)PRVM_serveredictfloat(ent, armorvalue);
-       stats[STAT_WEAPON] = client->weaponmodelindex;
-       stats[STAT_HEALTH] = (int)PRVM_serveredictfloat(ent, health);
-       stats[STAT_AMMO] = (int)PRVM_serveredictfloat(ent, currentammo);
-       stats[STAT_SHELLS] = (int)PRVM_serveredictfloat(ent, ammo_shells);
-       stats[STAT_NAILS] = (int)PRVM_serveredictfloat(ent, ammo_nails);
-       stats[STAT_ROCKETS] = (int)PRVM_serveredictfloat(ent, ammo_rockets);
-       stats[STAT_CELLS] = (int)PRVM_serveredictfloat(ent, ammo_cells);
-       stats[STAT_ACTIVEWEAPON] = (int)PRVM_serveredictfloat(ent, weapon);
-       stats[STAT_VIEWZOOM] = viewzoom;
-       stats[STAT_TOTALSECRETS] = (int)PRVM_serverglobalfloat(total_secrets);
-       stats[STAT_TOTALMONSTERS] = (int)PRVM_serverglobalfloat(total_monsters);
-       // 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_SECRETS] = PRVM_serverglobalfloat(found_secrets);
-       //stats[STAT_MONSTERS] = PRVM_serverglobalfloat(killed_monsters);
-
-       if(!sv_gameplayfix_customstats.integer)
-       {
-               statsf[STAT_MOVEVARS_AIRACCEL_QW_STRETCHFACTOR] = sv_airaccel_qw_stretchfactor.value;
-               statsf[STAT_MOVEVARS_AIRCONTROL_PENALTY] = sv_aircontrol_penalty.value;
-               statsf[STAT_MOVEVARS_AIRSPEEDLIMIT_NONQW] = sv_airspeedlimit_nonqw.value;               
-               statsf[STAT_MOVEVARS_AIRSTRAFEACCEL_QW] = sv_airstrafeaccel_qw.value;
-               statsf[STAT_MOVEVARS_AIRCONTROL_POWER] = sv_aircontrol_power.value;
-               // movement settings for prediction
-               // note: these are not sent in protocols with lower MAX_CL_STATS limits
-               stats[STAT_MOVEFLAGS] = MOVEFLAG_VALID
-                       | (sv_gameplayfix_q2airaccelerate.integer ? MOVEFLAG_Q2AIRACCELERATE : 0)
-                       | (sv_gameplayfix_nogravityonground.integer ? MOVEFLAG_NOGRAVITYONGROUND : 0)
-                       | (sv_gameplayfix_gravityunaffectedbyticrate.integer ? MOVEFLAG_GRAVITYUNAFFECTEDBYTICRATE : 0)
-               ;
-               statsf[STAT_MOVEVARS_WARSOWBUNNY_AIRFORWARDACCEL] = sv_warsowbunny_airforwardaccel.value;
-               statsf[STAT_MOVEVARS_WARSOWBUNNY_ACCEL] = sv_warsowbunny_accel.value;
-               statsf[STAT_MOVEVARS_WARSOWBUNNY_TOPSPEED] = sv_warsowbunny_topspeed.value;
-               statsf[STAT_MOVEVARS_WARSOWBUNNY_TURNACCEL] = sv_warsowbunny_turnaccel.value;
-               statsf[STAT_MOVEVARS_WARSOWBUNNY_BACKTOSIDERATIO] = sv_warsowbunny_backtosideratio.value;
-               statsf[STAT_MOVEVARS_AIRSTOPACCELERATE] = sv_airstopaccelerate.value;
-               statsf[STAT_MOVEVARS_AIRSTRAFEACCELERATE] = sv_airstrafeaccelerate.value;
-               statsf[STAT_MOVEVARS_MAXAIRSTRAFESPEED] = sv_maxairstrafespeed.value;
-               statsf[STAT_MOVEVARS_AIRCONTROL] = sv_aircontrol.value;
-               statsf[STAT_FRAGLIMIT] = fraglimit.value;
-               statsf[STAT_TIMELIMIT] = timelimit.value;
-               statsf[STAT_MOVEVARS_FRICTION] = sv_friction.value;     
-               statsf[STAT_MOVEVARS_WATERFRICTION] = sv_waterfriction.value >= 0 ? sv_waterfriction.value : sv_friction.value;
-               statsf[STAT_MOVEVARS_TICRATE] = sys_ticrate.value;
-               statsf[STAT_MOVEVARS_TIMESCALE] = host_timescale.value;
-               statsf[STAT_MOVEVARS_GRAVITY] = sv_gravity.value;
-               statsf[STAT_MOVEVARS_STOPSPEED] = sv_stopspeed.value;
-               statsf[STAT_MOVEVARS_MAXSPEED] = sv_maxspeed.value;
-               statsf[STAT_MOVEVARS_SPECTATORMAXSPEED] = sv_maxspeed.value; // FIXME: QW has a separate cvar for this
-               statsf[STAT_MOVEVARS_ACCELERATE] = sv_accelerate.value;
-               statsf[STAT_MOVEVARS_AIRACCELERATE] = sv_airaccelerate.value >= 0 ? sv_airaccelerate.value : sv_accelerate.value;
-               statsf[STAT_MOVEVARS_WATERACCELERATE] = sv_wateraccelerate.value >= 0 ? sv_wateraccelerate.value : sv_accelerate.value;
-               statsf[STAT_MOVEVARS_ENTGRAVITY] = gravity;
-               statsf[STAT_MOVEVARS_JUMPVELOCITY] = sv_jumpvelocity.value;
-               statsf[STAT_MOVEVARS_EDGEFRICTION] = sv_edgefriction.value;
-               statsf[STAT_MOVEVARS_MAXAIRSPEED] = sv_maxairspeed.value;
-               statsf[STAT_MOVEVARS_STEPHEIGHT] = sv_stepheight.value;
-               statsf[STAT_MOVEVARS_AIRACCEL_QW] = sv_airaccel_qw.value;
-               statsf[STAT_MOVEVARS_AIRACCEL_SIDEWAYS_FRICTION] = sv_airaccel_sideways_friction.value;
-       }
-
-       if (sv.protocol == PROTOCOL_QUAKE || sv.protocol == PROTOCOL_QUAKEDP || sv.protocol == PROTOCOL_NEHAHRAMOVIE || sv.protocol == PROTOCOL_NEHAHRABJP || sv.protocol == PROTOCOL_NEHAHRABJP2 || sv.protocol == PROTOCOL_NEHAHRABJP3 || sv.protocol == PROTOCOL_DARKPLACES1 || sv.protocol == PROTOCOL_DARKPLACES2 || sv.protocol == PROTOCOL_DARKPLACES3 || sv.protocol == PROTOCOL_DARKPLACES4 || sv.protocol == PROTOCOL_DARKPLACES5)
-       {
-               if (stats[STAT_VIEWHEIGHT] != DEFAULT_VIEWHEIGHT) bits |= SU_VIEWHEIGHT;
-               bits |= SU_ITEMS;
-               if (stats[STAT_WEAPONFRAME]) bits |= SU_WEAPONFRAME;
-               if (stats[STAT_ARMOR]) bits |= SU_ARMOR;
-               bits |= SU_WEAPON;
-               // FIXME: which protocols support this?  does PROTOCOL_DARKPLACES3 support viewzoom?
-               if (sv.protocol == PROTOCOL_DARKPLACES2 || sv.protocol == PROTOCOL_DARKPLACES3 || sv.protocol == PROTOCOL_DARKPLACES4 || sv.protocol == PROTOCOL_DARKPLACES5)
-                       if (viewzoom != 255)
-                               bits |= SU_VIEWZOOM;
-       }
-
-       if (bits >= 65536)
-               bits |= SU_EXTEND1;
-       if (bits >= 16777216)
-               bits |= SU_EXTEND2;
-
-       // send the data
-       MSG_WriteByte (msg, svc_clientdata);
-       MSG_WriteShort (msg, bits);
-       if (bits & SU_EXTEND1)
-               MSG_WriteByte(msg, bits >> 16);
-       if (bits & SU_EXTEND2)
-               MSG_WriteByte(msg, bits >> 24);
-
-       if (bits & SU_VIEWHEIGHT)
-               MSG_WriteChar (msg, stats[STAT_VIEWHEIGHT]);
-
-       if (bits & SU_IDEALPITCH)
-               MSG_WriteChar (msg, (int)PRVM_serveredictfloat(ent, idealpitch));
-
-       for (i=0 ; i<3 ; i++)
-       {
-               if (bits & (SU_PUNCH1<<i))
-               {
-                       if (sv.protocol == PROTOCOL_QUAKE || sv.protocol == PROTOCOL_QUAKEDP || sv.protocol == PROTOCOL_NEHAHRAMOVIE || sv.protocol == PROTOCOL_NEHAHRABJP || sv.protocol == PROTOCOL_NEHAHRABJP2 || sv.protocol == PROTOCOL_NEHAHRABJP3)
-                               MSG_WriteChar(msg, (int)PRVM_serveredictvector(ent, punchangle)[i]);
-                       else
-                               MSG_WriteAngle16i(msg, PRVM_serveredictvector(ent, punchangle)[i]);
-               }
-               if (bits & (SU_PUNCHVEC1<<i))
-               {
-                       if (sv.protocol == PROTOCOL_DARKPLACES1 || sv.protocol == PROTOCOL_DARKPLACES2 || sv.protocol == PROTOCOL_DARKPLACES3 || sv.protocol == PROTOCOL_DARKPLACES4)
-                               MSG_WriteCoord16i(msg, punchvector[i]);
-                       else
-                               MSG_WriteCoord32f(msg, punchvector[i]);
-               }
-               if (bits & (SU_VELOCITY1<<i))
-               {
-                       if (sv.protocol == PROTOCOL_QUAKE || sv.protocol == PROTOCOL_QUAKEDP || sv.protocol == PROTOCOL_NEHAHRAMOVIE || sv.protocol == PROTOCOL_NEHAHRABJP || sv.protocol == PROTOCOL_NEHAHRABJP2 || sv.protocol == PROTOCOL_NEHAHRABJP3 || sv.protocol == PROTOCOL_DARKPLACES1 || sv.protocol == PROTOCOL_DARKPLACES2 || sv.protocol == PROTOCOL_DARKPLACES3 || sv.protocol == PROTOCOL_DARKPLACES4)
-                               MSG_WriteChar(msg, (int)(PRVM_serveredictvector(ent, velocity)[i] * (1.0f / 16.0f)));
-                       else
-                               MSG_WriteCoord32f(msg, PRVM_serveredictvector(ent, velocity)[i]);
-               }
-       }
-
-       if (bits & SU_ITEMS)
-               MSG_WriteLong (msg, stats[STAT_ITEMS]);
-
-       if (sv.protocol == PROTOCOL_DARKPLACES5)
-       {
-               if (bits & SU_WEAPONFRAME)
-                       MSG_WriteShort (msg, stats[STAT_WEAPONFRAME]);
-               if (bits & SU_ARMOR)
-                       MSG_WriteShort (msg, stats[STAT_ARMOR]);
-               if (bits & SU_WEAPON)
-                       MSG_WriteShort (msg, stats[STAT_WEAPON]);
-               MSG_WriteShort (msg, stats[STAT_HEALTH]);
-               MSG_WriteShort (msg, stats[STAT_AMMO]);
-               MSG_WriteShort (msg, stats[STAT_SHELLS]);
-               MSG_WriteShort (msg, stats[STAT_NAILS]);
-               MSG_WriteShort (msg, stats[STAT_ROCKETS]);
-               MSG_WriteShort (msg, stats[STAT_CELLS]);
-               MSG_WriteShort (msg, stats[STAT_ACTIVEWEAPON]);
-               if (bits & SU_VIEWZOOM)
-                       MSG_WriteShort (msg, bound(0, stats[STAT_VIEWZOOM], 65535));
-       }
-       else if (sv.protocol == PROTOCOL_QUAKE || sv.protocol == PROTOCOL_QUAKEDP || sv.protocol == PROTOCOL_NEHAHRAMOVIE || sv.protocol == PROTOCOL_NEHAHRABJP || sv.protocol == PROTOCOL_NEHAHRABJP2 || sv.protocol == PROTOCOL_NEHAHRABJP3 || 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]);
-               if (bits & SU_ARMOR)
-                       MSG_WriteByte (msg, stats[STAT_ARMOR]);
-               if (bits & SU_WEAPON)
-               {
-                       if (sv.protocol == PROTOCOL_NEHAHRABJP || sv.protocol == PROTOCOL_NEHAHRABJP2 || sv.protocol == PROTOCOL_NEHAHRABJP3)
-                               MSG_WriteShort (msg, stats[STAT_WEAPON]);
-                       else
-                               MSG_WriteByte (msg, stats[STAT_WEAPON]);
-               }
-               MSG_WriteShort (msg, stats[STAT_HEALTH]);
-               MSG_WriteByte (msg, stats[STAT_AMMO]);
-               MSG_WriteByte (msg, stats[STAT_SHELLS]);
-               MSG_WriteByte (msg, stats[STAT_NAILS]);
-               MSG_WriteByte (msg, stats[STAT_ROCKETS]);
-               MSG_WriteByte (msg, stats[STAT_CELLS]);
-               if (gamemode == GAME_HIPNOTIC || gamemode == GAME_ROGUE || gamemode == GAME_QUOTH || IS_OLDNEXUIZ_DERIVED(gamemode))
-               {
-                       for (i = 0;i < 32;i++)
-                               if (stats[STAT_ACTIVEWEAPON] & (1<<i))
-                                       break;
-                       MSG_WriteByte (msg, i);
-               }
-               else
-                       MSG_WriteByte (msg, stats[STAT_ACTIVEWEAPON]);
-               if (bits & SU_VIEWZOOM)
-               {
-                       if (sv.protocol == PROTOCOL_DARKPLACES2 || sv.protocol == PROTOCOL_DARKPLACES3 || sv.protocol == PROTOCOL_DARKPLACES4)
-                               MSG_WriteByte (msg, bound(0, stats[STAT_VIEWZOOM], 255));
-                       else
-                               MSG_WriteShort (msg, bound(0, stats[STAT_VIEWZOOM], 65535));
-               }
-       }
-}
-
-void SV_FlushBroadcastMessages(void)
-{
-       int i;
-       client_t *client;
-       if (sv.datagram.cursize <= 0)
-               return;
-       for (i = 0, client = svs.clients;i < svs.maxclients;i++, client++)
-       {
-               if (!client->begun || !client->netconnection || client->unreliablemsg.cursize + sv.datagram.cursize > client->unreliablemsg.maxsize || client->unreliablemsg_splitpoints >= (int)(sizeof(client->unreliablemsg_splitpoint)/sizeof(client->unreliablemsg_splitpoint[0])))
-                       continue;
-               SZ_Write(&client->unreliablemsg, sv.datagram.data, sv.datagram.cursize);
-               client->unreliablemsg_splitpoint[client->unreliablemsg_splitpoints++] = client->unreliablemsg.cursize;
-       }
-       SZ_Clear(&sv.datagram);
-}
+       client->ping = 0;
 
-static void SV_WriteUnreliableMessages(client_t *client, sizebuf_t *msg, int maxsize, int maxsize2)
-{
-       // scan the splitpoints to find out how many we can fit in
-       int numsegments, j, split;
-       if (!client->unreliablemsg_splitpoints)
-               return;
-       // always accept the first one if it's within 1024 bytes, this ensures
-       // that very big datagrams which are over the rate limit still get
-       // through, just to keep it working
-       for (numsegments = 1;numsegments < client->unreliablemsg_splitpoints;numsegments++)
-               if (msg->cursize + client->unreliablemsg_splitpoint[numsegments] > maxsize)
-                       break;
-       // the first segment gets an exemption from the rate limiting, otherwise
-       // it could get dropped consistently due to a low rate limit
-       if (numsegments == 1)
-               maxsize = maxsize2;
-       // some will fit, so add the ones that will fit
-       split = client->unreliablemsg_splitpoint[numsegments-1];
-       // note this discards ones that were accepted by the segments scan but
-       // can not fit, such as a really huge first one that will never ever
-       // fit in a packet...
-       if (msg->cursize + split <= maxsize)
-               SZ_Write(msg, client->unreliablemsg.data, split);
-       // remove the part we sent, keeping any remaining data
-       client->unreliablemsg.cursize -= split;
-       if (client->unreliablemsg.cursize > 0)
-               memmove(client->unreliablemsg.data, client->unreliablemsg.data + split, client->unreliablemsg.cursize);
-       // adjust remaining splitpoints
-       client->unreliablemsg_splitpoints -= numsegments;
-       for (j = 0;j < client->unreliablemsg_splitpoints;j++)
-               client->unreliablemsg_splitpoint[j] = client->unreliablemsg_splitpoint[numsegments + j] - split;
+       // allow the client some time to send his keepalives, even if map loading took ages
+       client->netconnection->timeout = host.realtime + net_connecttimeout.value;
 }
 
 /*
-=======================
-SV_SendClientDatagram
-=======================
+================
+SV_ConnectClient
+
+Initializes a client_t for a new net connection.  This will only be called
+once for a player each game, not once for each level change.
+================
 */
-static void SV_SendClientDatagram (client_t *client)
+void SV_ConnectClient (int clientnum, netconn_t *netconnection)
 {
-       int clientrate, maxrate, maxsize, maxsize2, downloadsize;
-       sizebuf_t msg;
-       int stats[MAX_CL_STATS];
-       static unsigned char sv_sendclientdatagram_buf[NET_MAXMESSAGE];
-       double timedelta;
-
-       // obey rate limit by limiting packet frequency if the packet size
-       // limiting fails
-       // (usually this is caused by reliable messages)
-       if (!NetConn_CanSend(client->netconnection))
-               return;
-
-       // PROTOCOL_DARKPLACES5 and later support packet size limiting of updates
-       maxrate = max(NET_MINRATE, sv_maxrate.integer);
-       if (sv_maxrate.integer != maxrate)
-               Cvar_SetValueQuick(&sv_maxrate, maxrate);
+       prvm_prog_t *prog = SVVM_prog;
+       client_t                *client;
+       int                             i;
 
-       // clientrate determines the 'cleartime' of a packet
-       // (how long to wait before sending another, based on this packet's size)
-       clientrate = bound(NET_MINRATE, client->rate, maxrate);
+       client = svs.clients + clientnum;
 
-       switch (sv.protocol)
+// set up the client_t
+       if (sv.loadgame)
        {
-       case PROTOCOL_QUAKE:
-       case PROTOCOL_QUAKEDP:
-       case PROTOCOL_NEHAHRAMOVIE:
-       case PROTOCOL_NEHAHRABJP:
-       case PROTOCOL_NEHAHRABJP2:
-       case PROTOCOL_NEHAHRABJP3:
-       case PROTOCOL_QUAKEWORLD:
-               // no packet size limit support on Quake protocols because it just
-               // causes missing entities/effects
-               // packets are simply sent less often to obey the rate limit
-               maxsize = 1024;
-               maxsize2 = 1024;
-               break;
-       case PROTOCOL_DARKPLACES1:
-       case PROTOCOL_DARKPLACES2:
-       case PROTOCOL_DARKPLACES3:
-       case PROTOCOL_DARKPLACES4:
-               // no packet size limit support on DP1-4 protocols because they kick
-               // the client off if they overflow, and miss effects
-               // packets are simply sent less often to obey the rate limit
-               maxsize = sizeof(sv_sendclientdatagram_buf);
-               maxsize2 = sizeof(sv_sendclientdatagram_buf);
-               break;
-       default:
-               // DP5 and later protocols support packet size limiting which is a
-               // better method than limiting packet frequency as QW does
-               //
-               // at very low rates (or very small sys_ticrate) the packet size is
-               // not reduced below 128, but packets may be sent less often
-
-               // how long are bursts?
-               timedelta = host_client->rate_burstsize / (double)client->rate;
-
-               // how much of the burst do we keep reserved?
-               timedelta *= 1 - net_burstreserve.value;
-
-               // only try to use excess time
-               timedelta = bound(0, host.realtime - host_client->netconnection->cleartime, timedelta);
-
-               // but we know next packet will be in sys_ticrate, so we can use up THAT bandwidth
-               timedelta += sys_ticrate.value;
-
-               // note: packet overhead (not counted in maxsize) is 28 bytes
-               maxsize = (int)(clientrate * timedelta) - 28;
-
-               // put it in sound bounds
-               maxsize = bound(128, maxsize, 1400);
-               maxsize2 = 1400;
-
-               // csqc entities can easily exceed 128 bytes, so disable throttling in
-               // mods that use csqc (they are likely to use less bandwidth anyway)
-               if((net_usesizelimit.integer == 1) ? (sv.csqc_progsize > 0) : (net_usesizelimit.integer < 1))
-                       maxsize = maxsize2;
-
-               break;
+               float backupparms[NUM_SPAWN_PARMS];
+               memcpy(backupparms, client->spawn_parms, sizeof(backupparms));
+               memset(client, 0, sizeof(*client));
+               memcpy(client->spawn_parms, backupparms, sizeof(backupparms));
        }
+       else
+               memset(client, 0, sizeof(*client));
+       client->active = true;
+       client->netconnection = netconnection;
+
+       Con_DPrintf("Client %s connected\n", client->netconnection ? client->netconnection->address : "botclient");
 
-       if (LHNETADDRESS_GetAddressType(&host_client->netconnection->peeraddress) == LHNETADDRESSTYPE_LOOP && !host_limitlocal.integer)
+       if(client->netconnection && client->netconnection->crypto.authenticated)
        {
-               // for good singleplayer, send huge packets
-               maxsize = sizeof(sv_sendclientdatagram_buf);
-               maxsize2 = sizeof(sv_sendclientdatagram_buf);
-               // never limit frequency in singleplayer
-               clientrate = 1000000000;
+               Con_Printf("%s connection to %s has been established: client is %s@%s%.*s, I am %.*s@%s%.*s\n",
+                               client->netconnection->crypto.use_aes ? "Encrypted" : "Authenticated",
+                               client->netconnection->address,
+                               client->netconnection->crypto.client_idfp[0] ? client->netconnection->crypto.client_idfp : "-",
+                               (client->netconnection->crypto.client_issigned || !client->netconnection->crypto.client_keyfp[0]) ? "" : "~",
+                               crypto_keyfp_recommended_length, client->netconnection->crypto.client_keyfp[0] ? client->netconnection->crypto.client_keyfp : "-",
+                               crypto_keyfp_recommended_length, client->netconnection->crypto.server_idfp[0] ? client->netconnection->crypto.server_idfp : "-",
+                               (client->netconnection->crypto.server_issigned || !client->netconnection->crypto.server_keyfp[0]) ? "" : "~",
+                               crypto_keyfp_recommended_length, client->netconnection->crypto.server_keyfp[0] ? client->netconnection->crypto.server_keyfp : "-"
+                               );
        }
 
-       // while downloading, limit entity updates to half the packet
-       // (any leftover space will be used for downloading)
-       if (host_client->download_file)
-               maxsize /= 2;
-
-       msg.data = sv_sendclientdatagram_buf;
-       msg.maxsize = sizeof(sv_sendclientdatagram_buf);
-       msg.cursize = 0;
-       msg.allowoverflow = false;
+       strlcpy(client->name, "unconnected", sizeof(client->name));
+       strlcpy(client->old_name, "unconnected", sizeof(client->old_name));
+       client->prespawned = false;
+       client->spawned = false;
+       client->begun = false;
+       client->edict = PRVM_EDICT_NUM(clientnum+1);
+       if (client->netconnection)
+               client->netconnection->message.allowoverflow = true;            // we can catch it
+       // prepare the unreliable message buffer
+       client->unreliablemsg.data = client->unreliablemsg_data;
+       client->unreliablemsg.maxsize = sizeof(client->unreliablemsg_data);
+       // updated by receiving "rate" command from client, this is also the default if not using a DP client
+       client->rate = 1000000000;
+       client->connecttime = host.realtime;
 
-       if (host_client->begun)
-       {
-               // the player is in the game
-               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);
-               // now update the stats[] array using any registered custom fields
-               VM_SV_UpdateCustomStats(client, client->edict, &msg, stats);
-               // set host_client->statsdeltabits
-               Protocol_UpdateClientStats (stats);
-
-               // add as many queued unreliable messages (effects) as we can fit
-               // limit effects to half of the remaining space
-               if (client->unreliablemsg.cursize)
-                       SV_WriteUnreliableMessages (client, &msg, maxsize/2, maxsize2);
-
-               // now write as many entities as we can fit, and also sends stats
-               SV_WriteEntitiesToClient (client, client->edict, &msg, maxsize);
-       }
-       else if (host.realtime > client->keepalivetime)
+       if (!sv.loadgame)
        {
-               // the player isn't totally in the game yet
-               // send small keepalive messages if too much time has passed
-               // (may also be sending downloads)
-               client->keepalivetime = host.realtime + 5;
-               MSG_WriteChar (&msg, svc_nop);
-       }
+               // call the progs to get default spawn parms for the new client
+               // set self to world to intentionally cause errors with broken SetNewParms code in some mods
+               PRVM_serverglobalfloat(time) = sv.time;
+               PRVM_serverglobaledict(self) = 0;
+               prog->ExecuteProgram(prog, PRVM_serverfunction(SetNewParms), "QC function SetNewParms is missing");
+               for (i=0 ; i<NUM_SPAWN_PARMS ; i++)
+                       client->spawn_parms[i] = (&PRVM_serverglobalfloat(parm1))[i];
 
-       // if a download is active, see if there is room to fit some download data
-       // in this packet
-       downloadsize = min(maxsize*2,maxsize2) - msg.cursize - 7;
-       if (host_client->download_file && host_client->download_started && downloadsize > 0)
-       {
-               fs_offset_t downloadstart;
-               unsigned char data[1400];
-               downloadstart = FS_Tell(host_client->download_file);
-               downloadsize = min(downloadsize, (int)sizeof(data));
-               downloadsize = FS_Read(host_client->download_file, data, downloadsize);
-               // note this sends empty messages if at the end of the file, which is
-               // necessary to keep the packet loss logic working
-               // (the last blocks may be lost and need to be re-sent, and that will
-               //  only occur if the client acks the empty end messages, revealing
-               //  a gap in the download progress, causing the last blocks to be
-               //  sent again)
-               MSG_WriteChar (&msg, svc_downloaddata);
-               MSG_WriteLong (&msg, downloadstart);
-               MSG_WriteShort (&msg, downloadsize);
-               if (downloadsize > 0)
-                       SZ_Write (&msg, data, downloadsize);
+               // set up the entity for this client (including .colormap, .team, etc)
+               PRVM_ED_ClearEdict(prog, client->edict);
        }
 
-       // reliable only if none is in progress
-       if(client->sendsignon != 2 && !client->netconnection->sendMessageLength)
-               SV_WriteDemoMessage(client, &(client->netconnection->message), false);
-       // unreliable
-       SV_WriteDemoMessage(client, &msg, false);
-
-// send the datagram
-       NetConn_SendUnreliableMessage (client->netconnection, &msg, sv.protocol, clientrate, client->rate_burstsize, client->sendsignon == 2);
-       if (client->sendsignon == 1 && !client->netconnection->message.cursize)
-               client->sendsignon = 2; // prevent reliable until client sends prespawn (this is the keepalive phase)
+       // don't call SendServerinfo for a fresh botclient because its fields have
+       // not been set up by the qc yet
+       if (client->netconnection)
+               SV_SendServerinfo (client);
+       else
+               client->prespawned = client->spawned = client->begun = true;
 }
 
 /*
-=======================
-SV_UpdateToReliableMessages
-=======================
+=====================
+SV_DropClient
+
+Called when the player is getting totally kicked off the host
+if (leaving = true), don't bother sending signofs
+=====================
 */
-static void SV_UpdateToReliableMessages (void)
+void SV_DropClient(qbool leaving, const char *fmt, ... )
 {
        prvm_prog_t *prog = SVVM_prog;
-       int i, j;
-       client_t *client;
-       const char *name;
-       const char *model;
-       const char *skin;
-       int clientcamera;
-
-// check for changes to be sent over the reliable streams
-       for (i = 0, host_client = svs.clients;i < svs.maxclients;i++, host_client++)
+       int i;
+
+       va_list argptr;
+       char reason[512] = "";
+
+       Con_Printf("Client \"%s\" dropped", host_client->name);
+
+       if(fmt)
        {
-               // update the host_client fields we care about according to the entity fields
-               host_client->edict = PRVM_EDICT_NUM(i+1);
-
-               // DP_SV_CLIENTNAME
-               name = PRVM_GetString(prog, PRVM_serveredictstring(host_client->edict, 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));
-               if (name != host_client->name) // prevent buffer overlap SIGABRT on Mac OSX
-                       strlcpy (host_client->name, name, sizeof (host_client->name));
-               SV_Name(i);
-
-               // DP_SV_CLIENTCOLORS
-               host_client->colors = (int)PRVM_serveredictfloat(host_client->edict, clientcolors);
-               if (host_client->old_colors != host_client->colors)
-               {
-                       host_client->old_colors = host_client->colors;
-                       // send notification to all clients
-                       MSG_WriteByte (&sv.reliable_datagram, svc_updatecolors);
-                       MSG_WriteByte (&sv.reliable_datagram, i);
-                       MSG_WriteByte (&sv.reliable_datagram, host_client->colors);
-               }
+               va_start(argptr, fmt);
+               dpvsnprintf(reason, sizeof(reason), fmt, argptr);
+               va_end(argptr);
 
-               // NEXUIZ_PLAYERMODEL
-               model = PRVM_GetString(prog, PRVM_serveredictstring(host_client->edict, 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));
-               if (model != host_client->playermodel) // prevent buffer overlap SIGABRT on Mac OSX
-                       strlcpy (host_client->playermodel, model, sizeof (host_client->playermodel));
-               PRVM_serveredictstring(host_client->edict, playermodel) = PRVM_SetEngineString(prog, host_client->playermodel);
-
-               // NEXUIZ_PLAYERSKIN
-               skin = PRVM_GetString(prog, PRVM_serveredictstring(host_client->edict, 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));
-               if (skin != host_client->playerskin) // prevent buffer overlap SIGABRT on Mac OSX
-                       strlcpy (host_client->playerskin, skin, sizeof (host_client->playerskin));
-               PRVM_serveredictstring(host_client->edict, playerskin) = PRVM_SetEngineString(prog, host_client->playerskin);
-
-               // TODO: add an extension name for this [1/17/2008 Black]
-               clientcamera = PRVM_serveredictedict(host_client->edict, clientcamera);
-               if (clientcamera > 0)
-               {
-                       int oldclientcamera = host_client->clientcamera;
-                       if (clientcamera >= prog->max_edicts || PRVM_EDICT_NUM(clientcamera)->priv.required->free)
-                               clientcamera = PRVM_NUM_FOR_EDICT(host_client->edict);
-                       host_client->clientcamera = clientcamera;
+               Con_Printf(" (%s)\n", reason);
+       }
+       else
+       {
+               Con_Printf(" \n");
+       }
 
-                       if (oldclientcamera != host_client->clientcamera && host_client->netconnection)
+       SV_StopDemoRecording(host_client);
+
+       // make sure edict is not corrupt (from a level change for example)
+       host_client->edict = PRVM_EDICT_NUM(host_client - svs.clients + 1);
+
+       if (host_client->netconnection)
+       {
+               // tell the client to be gone
+               if (!leaving)
+               {
+                       // LadyHavoc: no opportunity for resending, so use unreliable 3 times
+                       unsigned char bufdata[520]; // Disconnect reason string can be 512 characters
+                       sizebuf_t buf;
+                       memset(&buf, 0, sizeof(buf));
+                       buf.data = bufdata;
+                       buf.maxsize = sizeof(bufdata);
+                       MSG_WriteByte(&buf, svc_disconnect);
+                       if(fmt)
                        {
-                               MSG_WriteByte(&host_client->netconnection->message, svc_setview);
-                               MSG_WriteShort(&host_client->netconnection->message, host_client->clientcamera);
+                               if(sv.protocol == PROTOCOL_DARKPLACES8)
+                                       MSG_WriteString(&buf, reason);
+                               else
+                                       SV_ClientPrintf("%s\n", reason);
                        }
+                       NetConn_SendUnreliableMessage(host_client->netconnection, &buf, sv.protocol, 10000, 0, false);
+                       NetConn_SendUnreliableMessage(host_client->netconnection, &buf, sv.protocol, 10000, 0, false);
+                       NetConn_SendUnreliableMessage(host_client->netconnection, &buf, sv.protocol, 10000, 0, false);
                }
+       }
 
-               // frags
-               host_client->frags = (int)PRVM_serveredictfloat(host_client->edict, frags);
-               if(IS_OLDNEXUIZ_DERIVED(gamemode))
-                       if(!host_client->begun && host_client->netconnection)
-                               host_client->frags = -666;
-               if (host_client->old_frags != host_client->frags)
-               {
-                       host_client->old_frags = host_client->frags;
-                       // send notification to all clients
-                       MSG_WriteByte (&sv.reliable_datagram, svc_updatefrags);
-                       MSG_WriteByte (&sv.reliable_datagram, i);
-                       MSG_WriteShort (&sv.reliable_datagram, host_client->frags);
-               }
+       // call qc ClientDisconnect function
+       // LadyHavoc: don't call QC if server is dead (avoids recursive
+       // Host_Error in some mods when they run out of edicts)
+       if (host_client->clientconnectcalled && sv.active && host_client->edict)
+       {
+               // call the prog function for removing a client
+               // this will set the body to a dead frame, among other things
+               int saveSelf = PRVM_serverglobaledict(self);
+               host_client->clientconnectcalled = false;
+               PRVM_serverglobalfloat(time) = sv.time;
+               PRVM_serverglobaledict(self) = PRVM_EDICT_TO_PROG(host_client->edict);
+               prog->ExecuteProgram(prog, PRVM_serverfunction(ClientDisconnect), "QC function ClientDisconnect is missing");
+               PRVM_serverglobaledict(self) = saveSelf;
        }
 
-       for (j = 0, client = svs.clients;j < svs.maxclients;j++, client++)
-               if (client->netconnection && (client->begun || client->clientconnectcalled)) // also send MSG_ALL to people who are past ClientConnect, but not spawned yet
-                       SZ_Write (&client->netconnection->message, sv.reliable_datagram.data, sv.reliable_datagram.cursize);
+       if (host_client->netconnection)
+       {
+               // break the net connection
+               NetConn_Close(host_client->netconnection);
+               host_client->netconnection = NULL;
+       }
+       if(fmt)
+               SV_BroadcastPrintf("\003^3%s left the game (%s)\n", host_client->name, reason);
+       else
+               SV_BroadcastPrintf("\003^3%s left the game\n", host_client->name);
 
-       SZ_Clear (&sv.reliable_datagram);
-}
+       // if a download is active, close it
+       if (host_client->download_file)
+       {
+               Con_DPrintf("Download of %s aborted when %s dropped\n", host_client->download_name, host_client->name);
+               FS_Close(host_client->download_file);
+               host_client->download_file = NULL;
+               host_client->download_name[0] = 0;
+               host_client->download_expectedposition = 0;
+               host_client->download_started = false;
+       }
 
+       // remove leaving player from scoreboard
+       host_client->name[0] = 0;
+       host_client->colors = 0;
+       host_client->frags = 0;
+       // send notification to all clients
+       // get number of client manually just to make sure we get it right...
+       i = host_client - svs.clients;
+       MSG_WriteByte (&sv.reliable_datagram, svc_updatename);
+       MSG_WriteByte (&sv.reliable_datagram, i);
+       MSG_WriteString (&sv.reliable_datagram, host_client->name);
+       MSG_WriteByte (&sv.reliable_datagram, svc_updatecolors);
+       MSG_WriteByte (&sv.reliable_datagram, i);
+       MSG_WriteByte (&sv.reliable_datagram, host_client->colors);
+       MSG_WriteByte (&sv.reliable_datagram, svc_updatefrags);
+       MSG_WriteByte (&sv.reliable_datagram, i);
+       MSG_WriteShort (&sv.reliable_datagram, host_client->frags);
 
-/*
-=======================
-SV_SendClientMessages
-=======================
-*/
-void SV_SendClientMessages(void)
-{
-       int i, prepared = false;
+       // free the client now
+       if (host_client->entitydatabase)
+               EntityFrame_FreeDatabase(host_client->entitydatabase);
+       if (host_client->entitydatabase4)
+               EntityFrame4_FreeDatabase(host_client->entitydatabase4);
+       if (host_client->entitydatabase5)
+               EntityFrame5_FreeDatabase(host_client->entitydatabase5);
 
-       if (sv.protocol == PROTOCOL_QUAKEWORLD)
-               Sys_Error("SV_SendClientMessages: no quakeworld support\n");
+       if (sv.active)
+       {
+               // clear a fields that matter to DP_SV_CLIENTNAME and DP_SV_CLIENTCOLORS, and also frags
+               PRVM_ED_ClearEdict(prog, host_client->edict);
+       }
 
-       SV_FlushBroadcastMessages();
+       // clear the client struct (this sets active to false)
+       memset(host_client, 0, sizeof(*host_client));
 
-// update frags, names, etc
-       SV_UpdateToReliableMessages();
+       // update server listing on the master because player count changed
+       // (which the master uses for filtering empty/full servers)
+       NetConn_Heartbeat(1);
 
-// build individual updates
-       for (i = 0, host_client = svs.clients;i < svs.maxclients;i++, host_client++)
+       if (sv.loadgame)
        {
-               if (!host_client->active)
-                       continue;
-               if (!host_client->netconnection)
-                       continue;
-
-               if (host_client->netconnection->message.overflowed)
-               {
-                       SV_DropClient (true);   // if the message couldn't send, kick off
-                       continue;
-               }
-
-               if (!prepared)
+               for (i = 0;i < svs.maxclients;i++)
+                       if (svs.clients[i].active && !svs.clients[i].spawned)
+                               break;
+               if (i == svs.maxclients)
                {
-                       prepared = true;
-                       // only prepare entities once per frame
-                       SV_PrepareEntitiesForSending();
+                       Con_Printf("Loaded game, everyone rejoined - unpausing\n");
+                       sv.paused = sv.loadgame = false; // we're basically done with loading now
                }
-               SV_SendClientDatagram(host_client);
        }
-
-// clear muzzle flashes
-       SV_CleanupEnts();
 }
 
 static void SV_StartDownload_f(cmd_state_t *cmd)
@@ -3023,7 +1381,7 @@ SV_ModelIndex
 */
 int SV_ModelIndex(const char *s, int precachemode)
 {
-       int i, limit = ((sv.protocol == PROTOCOL_QUAKE || sv.protocol == PROTOCOL_QUAKEDP || sv.protocol == PROTOCOL_NEHAHRAMOVIE || sv.protocol == PROTOCOL_NEHAHRABJP || sv.protocol == PROTOCOL_NEHAHRABJP2 || sv.protocol == PROTOCOL_NEHAHRABJP3) ? 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;
@@ -3086,7 +1444,7 @@ SV_SoundIndex
 */
 int SV_SoundIndex(const char *s, int precachemode)
 {
-       int i, limit = ((sv.protocol == PROTOCOL_QUAKE || sv.protocol == PROTOCOL_QUAKEDP || sv.protocol == PROTOCOL_NEHAHRAMOVIE || sv.protocol == PROTOCOL_NEHAHRABJP || sv.protocol == PROTOCOL_NEHAHRABJP2 || sv.protocol == PROTOCOL_NEHAHRABJP3) ? 256 : MAX_SOUNDS);
+       int i, limit = ((sv.protocol == PROTOCOL_QUAKE || sv.protocol == PROTOCOL_QUAKEDP || sv.protocol == PROTOCOL_NEHAHRAMOVIE || sv.protocol == PROTOCOL_NEHAHRABJP) ? 256 : MAX_SOUNDS);
        char filename[MAX_QPATH];
        if (!s || !*s)
                return 0;
@@ -3217,16 +1575,16 @@ int SV_ParticleEffectIndex(const char *name)
        return 0;
 }
 
-dp_model_t *SV_GetModelByIndex(int modelindex)
+model_t *SV_GetModelByIndex(int modelindex)
 {
        return (modelindex > 0 && modelindex < MAX_MODELS) ? sv.models[modelindex] : NULL;
 }
 
-dp_model_t *SV_GetModelFromEdict(prvm_edict_t *ed)
+model_t *SV_GetModelFromEdict(prvm_edict_t *ed)
 {
        prvm_prog_t *prog = SVVM_prog;
        int modelindex;
-       if (!ed || ed->priv.server->free)
+       if (!ed || ed->free)
                return NULL;
        modelindex = (int)PRVM_serveredictfloat(ed, modelindex);
        return (modelindex > 0 && modelindex < MAX_MODELS) ? sv.models[modelindex] : NULL;
@@ -3253,7 +1611,7 @@ static void SV_CreateBaseline (void)
                // LadyHavoc: always clear state values, whether the entity is in use or not
                svent->priv.server->baseline = defaultstate;
 
-               if (svent->priv.server->free)
+               if (svent->free)
                        continue;
                if (entnum > svs.maxclients && !PRVM_serveredictfloat(svent, modelindex))
                        continue;
@@ -3392,6 +1750,12 @@ void SV_SaveSpawnparms (void)
        }
 }
 
+// Returns 1 if we're singleplayer, > 1 if we're a listen server
+int SV_IsLocalServer(void)
+{
+       return (host_isclient.integer && sv.active ? svs.maxclients : 0);
+}
+
 /*
 ================
 SV_SpawnServer
@@ -3406,7 +1770,7 @@ void SV_SpawnServer (const char *map)
        prvm_edict_t *ent;
        int i;
        char *entities;
-       dp_model_t *worldmodel;
+       model_t *worldmodel;
        char modelname[sizeof(sv.worldname)];
        char vabuf[1024];
 
@@ -3426,10 +1790,9 @@ void SV_SpawnServer (const char *map)
 
 //     SV_LockThreadMutex();
 
-       if(cls.state == ca_dedicated)
+       if(!host_isclient.integer)
                Sys_MakeProcessNice();
-
-       if (cls.state != ca_dedicated)
+       else
        {
                SCR_BeginLoadingPlaque(false);
                S_StopAllSounds();
@@ -3437,15 +1800,6 @@ void SV_SpawnServer (const char *map)
 
        if(sv.active)
        {
-               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");
-                       }
-               }
                World_End(&sv.world);
                if(PRVM_serverfunction(SV_Shutdown))
                {
@@ -3464,7 +1818,7 @@ void SV_SpawnServer (const char *map)
        {
                Con_Printf("Couldn't load map %s\n", modelname);
 
-               if(cls.state == ca_dedicated)
+               if(!host_isclient.integer)
                        Sys_MakeProcessMean();
 
 //             SV_UnlockThreadMutex();
@@ -3488,8 +1842,23 @@ void SV_SpawnServer (const char *map)
 //
 // tell all connected clients that we are going to a new level
 //
-       if (!sv.active)
+       if (sv.active)
+       {
+               client_t *client;
+               for (i = 0, client = svs.clients;i < svs.maxclients;i++, client++)
+               {
+                       if (client->netconnection)
+                       {
+                               MSG_WriteByte(&client->netconnection->message, svc_stufftext);
+                               MSG_WriteString(&client->netconnection->message, "reconnect\n");
+                       }
+               }
+       }
+       else
+       {
+               // open server port
                NetConn_OpenServerPorts(true);
+       }
 
 //
 // make cvars consistant
@@ -3596,7 +1965,7 @@ void SV_SpawnServer (const char *map)
        // AK possible hack since num_edicts is still 0
        ent = PRVM_EDICT_NUM(0);
        memset (ent->fields.fp, 0, prog->entityfields * sizeof(prvm_vec_t));
-       ent->priv.server->free = false;
+       ent->free = false;
        PRVM_serveredictstring(ent, model) = PRVM_SetEngineString(prog, sv.worldname);
        PRVM_serveredictfloat(ent, modelindex) = 1;             // world model
        PRVM_serveredictfloat(ent, solid) = SOLID_BSP;
@@ -3656,7 +2025,7 @@ void SV_SpawnServer (const char *map)
        // Once all init frames have been run, we consider svqc code fully initialized.
        prog->inittime = host.realtime;
 
-       if (cls.state == ca_dedicated)
+       if(!host_isclient.integer)
                Mod_PurgeUnused();
 
 // create a baseline for more efficient communications
@@ -3700,7 +2069,7 @@ void SV_SpawnServer (const char *map)
        Con_Printf("Server spawned.\n");
        NetConn_Heartbeat (2);
 
-       if(cls.state == ca_dedicated)
+       if(!host_isclient.integer)
                Sys_MakeProcessMean();
 
 //     SV_UnlockThreadMutex();
@@ -3718,10 +2087,12 @@ void SV_Shutdown(void)
        prvm_prog_t *prog = SVVM_prog;
        int i;
 
-       Con_DPrintf("SV_Shutdown\n");
+       SV_LockThreadMutex();
 
        if (!sv.active)
-               return;
+               goto end;
+
+       Con_DPrintf("SV_Shutdown\n");
 
        NetConn_Heartbeat(2);
        NetConn_Heartbeat(2);
@@ -3740,7 +2111,7 @@ void SV_Shutdown(void)
        }
        for (i = 0, host_client = svs.clients;i < svs.maxclients;i++, host_client++)
                if (host_client->active)
-                       SV_DropClient(false); // server shutdown
+                       SV_DropClient(false, "Server shutting down"); // server shutdown
 
        NetConn_CloseServerPorts();
 
@@ -3750,8 +2121,8 @@ void SV_Shutdown(void)
 //
        memset(&sv, 0, sizeof(sv));
        memset(svs.clients, 0, svs.maxclients*sizeof(client_t));
-
-       cl.islocalgame = false;
+end:
+       SV_UnlockThreadMutex();
 }
 
 /////////////////////////////////////////////////////
@@ -3770,7 +2141,7 @@ static void SVVM_end_increase_edicts(prvm_prog_t *prog)
 
        // link every entity except world
        for (i = 1, ent = prog->edicts;i < prog->num_edicts;i++, ent++)
-               if (!ent->priv.server->free && !VectorCompare(PRVM_serveredictvector(ent, absmin), PRVM_serveredictvector(ent, absmax)))
+               if (!ent->free && !VectorCompare(PRVM_serveredictvector(ent, absmin), PRVM_serveredictvector(ent, absmax)))
                        SV_LinkEdict(ent);
 }
 
@@ -3846,9 +2217,10 @@ static void SVVM_free_edict(prvm_prog_t *prog, prvm_edict_t *ed)
        PRVM_serveredictfloat(ed, solid) = 0;
 
        VM_RemoveEdictSkeleton(prog, ed);
+#ifdef USEODE
        World_Physics_RemoveFromEntity(&sv.world, ed);
        World_Physics_RemoveJointFromEntity(&sv.world, ed);
-
+#endif
        // make sure csqc networking is aware of the removed entity
        e = PRVM_NUM_FOR_EDICT(ed);
        sv.csqcentityversion[e] = 0;
@@ -3866,7 +2238,7 @@ static void SVVM_count_edicts(prvm_prog_t *prog)
        for (i=0 ; i<prog->num_edicts ; i++)
        {
                ent = PRVM_EDICT_NUM(i);
-               if (ent->priv.server->free)
+               if (ent->free)
                        continue;
                active++;
                if (PRVM_serveredictfloat(ent, solid))
@@ -3909,7 +2281,7 @@ static qbool SVVM_load_edict(prvm_prog_t *prog, prvm_edict_t *ent)
 static void SV_VM_Setup(void)
 {
        prvm_prog_t *prog = SVVM_prog;
-       PRVM_Prog_Init(prog, &cmd_server);
+       PRVM_Prog_Init(prog, cmd_local);
 
        // allocate the mempools
        // TODO: move the magic numbers/constants into #defines [9/13/2006 Black]
@@ -4096,6 +2468,28 @@ static void SV_VM_Setup(void)
        SV_Prepare_CSQC();
 }
 
+static void SV_CheckTimeouts(void)
+{
+       int i;
+
+       // never timeout loopback connections
+       for (i = (host_isclient.integer ? 1 : 0), host_client = &svs.clients[i]; i < svs.maxclients; i++, host_client++)
+               if (host_client->netconnection && host.realtime > host_client->netconnection->timeout)
+                       SV_DropClient(false, "Timed out");
+}
+
+/*
+==================
+SV_TimeReport
+
+Returns a time report string, for example for
+==================
+*/
+const char *SV_TimingReport(char *buf, size_t buflen)
+{
+       return va(buf, buflen, "%.1f%% CPU, %.2f%% lost, offset avg %.1fms, max %.1fms, sdev %.1fms", svs.perf_cpuload * 100, svs.perf_lost * 100, svs.perf_offset_avg * 1000, svs.perf_offset_max * 1000, svs.perf_offset_sdev * 1000);
+}
+
 extern cvar_t host_maxwait;
 extern cvar_t host_framerate;
 extern cvar_t cl_maxphysicsframesperserverframe;
@@ -4129,7 +2523,7 @@ double SV_Frame(double time)
                        }
 
                        if(svs.perf_lost > 0 && developer_extra.integer && playing) // only complain if anyone is looking
-                               Con_DPrintf("Server can't keep up: %s\n", Host_TimingReport(vabuf, sizeof(vabuf)));
+                               Con_DPrintf("Server can't keep up: %s\n", SV_TimingReport(vabuf, sizeof(vabuf)));
                }
 
                if(svs.perf_acc_realtime > 5 || sv.time < 10)
@@ -4149,7 +2543,10 @@ double SV_Frame(double time)
                 * be undersleeping due to select() detecting a new packet
                 */
                if (sv.active)
+               {
                        NetConn_ServerFrame();
+                       SV_CheckTimeouts();
+               }
        }
 
        /*
@@ -4322,13 +2719,16 @@ static int SV_ThreadFunc(void *voiddata)
                        }
                        if(svs.perf_lost > 0 && developer_extra.integer)
                                if(playing)
-                                       Con_DPrintf("Server can't keep up: %s\n", Host_TimingReport(vabuf, sizeof(vabuf)));
+                                       Con_DPrintf("Server can't keep up: %s\n", SV_TimingReport(vabuf, sizeof(vabuf)));
                        svs.perf_acc_realtime = svs.perf_acc_sleeptime = svs.perf_acc_lost = svs.perf_acc_offset = svs.perf_acc_offset_squared = svs.perf_acc_offset_max = svs.perf_acc_offset_samples = 0;
                }
 
                // get new packets
                if (sv.active)
+               {
                        NetConn_ServerFrame();
+                       SV_CheckTimeouts();
+               }
 
                // if the accumulators haven't become positive yet, wait a while
                wait = sv_timer * -1000000.0;