]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - cl_parse.c
changed all references to entity_render_t->frame to frame2 to eliminate
[xonotic/darkplaces.git] / cl_parse.c
index a8d6fb6cadd40b1358974e42a02cfedc50074c5b..4deb4711d8136a1d2618cc87e0a30a90878c6a1d 100644 (file)
@@ -23,6 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "cdaudio.h"
 #include "cl_collision.h"
 #include "csprogs.h"
+#include "libcurl.h"
 
 char *svc_strings[128] =
 {
@@ -83,7 +84,7 @@ char *svc_strings[128] =
        "", // 47
        "", // 48
        "", // 49
-       "svc_unusedlh1", //                             50              //
+       "svc_downloaddata", //                          50              // [int] start [short] size [variable length] data
        "svc_updatestatubyte", //                       51              // [byte] stat [byte] value
        "svc_effect", //                        52              // [vector] org [byte] modelindex [byte] startframe [byte] framecount [byte] framerate
        "svc_effect2", //                       53              // [vector] org [short] modelindex [short] startframe [byte] framecount [byte] framerate
@@ -163,7 +164,17 @@ cvar_t cl_sound_tink1 = {0, "cl_sound_tink1", "weapons/tink1.wav", "sound to pla
 cvar_t cl_sound_ric1 = {0, "cl_sound_ric1", "weapons/ric1.wav", "sound to play with 5% chance during TE_SPIKE/TE_SUPERSPIKE (empty cvar disables sound)"};
 cvar_t cl_sound_ric2 = {0, "cl_sound_ric2", "weapons/ric2.wav", "sound to play with 5% chance during TE_SPIKE/TE_SUPERSPIKE (empty cvar disables sound)"};
 cvar_t cl_sound_ric3 = {0, "cl_sound_ric3", "weapons/ric3.wav", "sound to play with 10% chance during TE_SPIKE/TE_SUPERSPIKE (empty cvar disables sound)"};
+
+#define RIC_GUNSHOT            1
+#define RIC_GUNSHOTQUAD        2
+cvar_t cl_sound_ric_gunshot = {0, "cl_sound_ric_gunshot", "0", "specifies if and when the related cl_sound_ric and cl_sound_tink sounds apply to TE_GUNSHOT/TE_GUNSHOTQUAD, 0 = no sound, 1 = TE_GUNSHOT, 2 = TE_GUNSHOTQUAD, 3 = TE_GUNSHOT and TE_GUNSHOTQUAD"};
 cvar_t cl_sound_r_exp3 = {0, "cl_sound_r_exp3", "weapons/r_exp3.wav", "sound to play during TE_EXPLOSION and related effects (empty cvar disables sound)"};
+cvar_t cl_serverextension_download = {0, "cl_serverextension_download", "0", "indicates whether the server supports the download command"};
+cvar_t cl_joinbeforedownloadsfinish = {CVAR_SAVE, "cl_joinbeforedownloadsfinish", "1", "if non-zero the game will begin after the map is loaded before other downloads finish"};
+cvar_t cl_nettimesyncfactor = {CVAR_SAVE, "cl_nettimesyncfactor", "0", "rate at which client time adapts to match server time, 1 = instantly, 0.125 = slowly, 0 = not at all (bounding still applies)"};
+cvar_t cl_nettimesyncboundmode = {CVAR_SAVE, "cl_nettimesyncboundmode", "6", "method of restricting client time to valid values, 0 = no correction, 1 = tight bounding (jerky with packet loss), 2 = loose bounding (corrects it if out of bounds), 3 = leniant bounding (ignores temporary errors due to varying framerate), 4 = slow adjustment method from Quake3, 5 = slighttly nicer version of Quake3 method, 6 = bounding + Quake3"};
+cvar_t cl_nettimesyncboundtolerance = {CVAR_SAVE, "cl_nettimesyncboundtolerance", "0.25", "how much error is tolerated by bounding check, as a fraction of frametime, 0.25 = up to 25% margin of error tolerated, 1 = use only new time, 0 = use only old time (same effect as setting cl_nettimesyncfactor to 1)"};
+cvar_t cl_iplog_name = {CVAR_SAVE, "cl_iplog_name", "darkplaces_iplog.txt", "name of iplog file containing player addresses for iplog_list command and automatic ip logging when parsing status command"};
 
 static qboolean QW_CL_CheckOrDownloadFile(const char *filename);
 static void QW_CL_RequestNextDownload(void);
@@ -251,6 +262,9 @@ void CL_ParseStartSoundPacket(int largesoundindex)
                return;
        }
 
+       if (ent >= cl.max_entities)
+               CL_ExpandEntities(ent);
+
        S_StartSound (ent, channel, cl.sound_precache[sound_num], pos, volume/255.0f, attenuation);
 }
 
@@ -264,7 +278,7 @@ so the server doesn't disconnect.
 */
 
 static unsigned char olddata[NET_MAXMESSAGE];
-void CL_KeepaliveMessage (void)
+void CL_KeepaliveMessage (qboolean readmessages)
 {
        float time;
        static double nextmsg = -1;
@@ -273,21 +287,24 @@ void CL_KeepaliveMessage (void)
        sizebuf_t old;
 
        // no need if server is local and definitely not if this is a demo
-       if (sv.active || !cls.netcon || cls.protocol == PROTOCOL_QUAKEWORLD)
+       if (!cls.netcon || cls.protocol == PROTOCOL_QUAKEWORLD)
                return;
 
-// read messages from server, should just be nops
-       oldreadcount = msg_readcount;
-       oldbadread = msg_badread;
-       old = net_message;
-       memcpy(olddata, net_message.data, net_message.cursize);
-
-       NetConn_ClientFrame();
-
-       msg_readcount = oldreadcount;
-       msg_badread = oldbadread;
-       net_message = old;
-       memcpy(net_message.data, olddata, net_message.cursize);
+       if (readmessages)
+       {
+               // read messages from server, should just be nops
+               oldreadcount = msg_readcount;
+               oldbadread = msg_badread;
+               old = net_message;
+               memcpy(olddata, net_message.data, net_message.cursize);
+
+               NetConn_ClientFrame();
+
+               msg_readcount = oldreadcount;
+               msg_badread = oldbadread;
+               net_message = old;
+               memcpy(net_message.data, olddata, net_message.cursize);
+       }
 
        if (cls.netcon && (time = Sys_DoubleTime()) >= nextmsg)
        {
@@ -300,8 +317,8 @@ void CL_KeepaliveMessage (void)
                memset(&msg, 0, sizeof(msg));
                msg.data = buf;
                msg.maxsize = sizeof(buf);
-               MSG_WriteChar(&msg, svc_nop);
-               NetConn_SendUnreliableMessage(cls.netcon, &msg, cls.protocol);
+               MSG_WriteChar(&msg, clc_nop);
+               NetConn_SendUnreliableMessage(cls.netcon, &msg, cls.protocol, 10000, false);
        }
 }
 
@@ -315,13 +332,13 @@ void CL_ParseEntityLump(char *entdata)
        data = entdata;
        if (!data)
                return;
-       if (!COM_ParseTokenConsole(&data))
+       if (!COM_ParseToken_Simple(&data, false))
                return; // error
        if (com_token[0] != '{')
                return; // error
        while (1)
        {
-               if (!COM_ParseTokenConsole(&data))
+               if (!COM_ParseToken_Simple(&data, false))
                        return; // error
                if (com_token[0] == '}')
                        break; // end of worldspawn
@@ -331,7 +348,7 @@ void CL_ParseEntityLump(char *entdata)
                        strlcpy (key, com_token, sizeof (key));
                while (key[strlen(key)-1] == ' ') // remove trailing spaces
                        key[strlen(key)-1] = 0;
-               if (!COM_ParseTokenConsole(&data))
+               if (!COM_ParseToken_Simple(&data, false))
                        return; // error
                strlcpy (value, com_token, sizeof (value));
                if (!strcmp("sky", key))
@@ -353,6 +370,47 @@ void CL_ParseEntityLump(char *entdata)
        }
 }
 
+extern void CL_Locs_Reload_f(void);
+extern void CL_VM_Init (void);
+static void CL_SetupWorldModel(void)
+{
+       // update the world model
+       cl.entities[0].render.model = cl.worldmodel = cl.model_precache[1];
+       CL_UpdateRenderEntity(&cl.entities[0].render);
+
+       // set up csqc world for collision culling
+       if (cl.worldmodel)
+       {
+               VectorCopy(cl.worldmodel->normalmins, cl.world.areagrid_mins);
+               VectorCopy(cl.worldmodel->normalmaxs, cl.world.areagrid_maxs);
+       }
+       else
+       {
+               VectorSet(cl.world.areagrid_mins, -4096, -4096, -4096);
+               VectorSet(cl.world.areagrid_maxs, 4096, 4096, 4096);
+       }
+       World_Clear(&cl.world);
+
+       // load or reload .loc file for team chat messages
+       CL_Locs_Reload_f();
+
+       // reset particles and other per-level things
+       R_Modules_NewMap();
+
+       // load the team chat beep if possible
+       cl.foundtalk2wav = FS_FileExists("sound/misc/talk2.wav");
+
+       // check memory integrity
+       Mem_CheckSentinelsGlobal();
+
+       // load the csqc now
+       if (cl.loadcsqc)
+       {
+               cl.loadcsqc = false;
+               CL_VM_Init();
+       }
+}
+
 static qboolean QW_CL_CheckOrDownloadFile(const char *filename)
 {
        qfile_t *file;
@@ -462,9 +520,13 @@ static void QW_CL_RequestNextDownload(void)
 
                cls.qw_downloadtype = dl_none;
 
+               // parse the Q3 shader files
+               Mod_LoadQ3Shaders();
+
                // touch all of the precached models that are still loaded so we can free
                // anything that isn't needed
-               Mod_ClearUsed();
+               if (!sv.active)
+                       Mod_ClearUsed();
                for (i = 1;i < MAX_MODELS && cl.model_name[i][0];i++)
                        Mod_FindName(cl.model_name[i]);
                // precache any models used by the client (this also marks them used)
@@ -491,12 +553,11 @@ static void QW_CL_RequestNextDownload(void)
 
                // now that we have a world model, set up the world entity, renderer
                // modules and csqc
-               cl.entities[0].render.model = cl.worldmodel = cl.model_precache[1];
-               CL_BoundingBoxForEntity(&cl.entities[0].render);
+               CL_SetupWorldModel();
 
-               R_Modules_NewMap();
-
-               // TODO: add pmodel/emodel player.mdl/eyes.mdl CRCs to userinfo
+               // add pmodel/emodel CRCs to userinfo
+               CL_SetInfo("pmodel", va("%i", FS_CRCFile("progs/player.mdl", NULL)), true, true, true, true);
+               CL_SetInfo("emodel", va("%i", FS_CRCFile("progs/eyes.mdl", NULL)), true, true, true, true);
 
                // done checking sounds and models, send a prespawn command now
                MSG_WriteByte(&cls.netcon->message, qw_clc_stringcmd);
@@ -507,6 +568,9 @@ static void QW_CL_RequestNextDownload(void)
                        Mem_Free(cls.qw_downloadmemory);
                        cls.qw_downloadmemory = NULL;
                }
+
+               // done loading
+               cl.loadfinished = true;
                break;
        case dl_sound:
                if (cls.qw_downloadnumber == 0)
@@ -600,6 +664,7 @@ static void QW_CL_ParseDownload(void)
        // read the fragment out of the packet
        MSG_ReadBytes(size, cls.qw_downloadmemory + cls.qw_downloadmemorycursize);
        cls.qw_downloadmemorycursize += size;
+       cls.qw_downloadspeedcount += size;
 
        cls.qw_downloadpercent = percent;
 
@@ -639,7 +704,7 @@ static void QW_CL_ParseModelList(void)
                if (nummodels==MAX_MODELS)
                        Host_Error("Server sent too many model precaches");
                if (strlen(str) >= MAX_QPATH)
-                       Host_Error("Server sent a precache name of %i characters (max %i)", strlen(str), MAX_QPATH - 1);
+                       Host_Error("Server sent a precache name of %i characters (max %i)", (int)strlen(str), MAX_QPATH - 1);
                strlcpy(cl.model_name[nummodels], str, sizeof (cl.model_name[nummodels]));
        }
 
@@ -673,7 +738,7 @@ static void QW_CL_ParseSoundList(void)
                if (numsounds==MAX_SOUNDS)
                        Host_Error("Server sent too many sound precaches");
                if (strlen(str) >= MAX_QPATH)
-                       Host_Error("Server sent a precache name of %i characters (max %i)", strlen(str), MAX_QPATH - 1);
+                       Host_Error("Server sent a precache name of %i characters (max %i)", (int)strlen(str), MAX_QPATH - 1);
                strlcpy(cl.sound_name[numsounds], str, sizeof (cl.sound_name[numsounds]));
        }
 
@@ -880,6 +945,382 @@ static void CL_UpdateItemsAndWeapon(void)
        cl.activeweapon = cl.stats[STAT_ACTIVEWEAPON];
 }
 
+void CL_BeginDownloads(qboolean aborteddownload)
+{
+       // quakeworld works differently
+       if (cls.protocol == PROTOCOL_QUAKEWORLD)
+               return;
+
+       // this would be a good place to do curl downloads
+       if(Curl_Have_forthismap())
+       {
+               Curl_Register_predownload(); // come back later
+               return;
+       }
+
+       // if we got here...
+       // curl is done, so let's start with the business
+       cl.loadbegun = true;
+
+       // if already downloading something from the previous level, don't stop it
+       if (cls.qw_downloadname[0])
+               return;
+
+       if (cl.downloadcsqc)
+       {
+               size_t progsize;
+               cl.downloadcsqc = false;
+               if (cls.netcon
+                && !sv.active
+                && csqc_progname.string
+                && csqc_progname.string[0]
+                && csqc_progcrc.integer >= 0
+                && cl_serverextension_download.integer
+                && (FS_CRCFile(csqc_progname.string, &progsize) != csqc_progcrc.integer || ((int)progsize != csqc_progsize.integer && csqc_progsize.integer != -1))
+                && !FS_FileExists(va("dlcache/%s.%i.%i", csqc_progname.string, csqc_progsize.integer, csqc_progcrc.integer)))
+               {
+                       Con_Printf("Downloading new CSQC code to dlcache/%s.%i.%i\n", csqc_progname.string, csqc_progsize.integer, csqc_progcrc.integer);
+                       Cmd_ForwardStringToServer(va("download %s", csqc_progname.string));
+                       return;
+               }
+       }
+
+       if (cl.loadmodel_current < cl.loadmodel_total)
+       {
+               // loading models
+
+               // parse the Q3 shader files
+               if (cl.loadmodel_current < 2)
+                       Mod_LoadQ3Shaders();
+
+               for (;cl.loadmodel_current < cl.loadmodel_total;cl.loadmodel_current++)
+               {
+                       if (cl.model_precache[cl.loadmodel_current] && cl.model_precache[cl.loadmodel_current]->Draw)
+                               continue;
+                       if (cls.signon < SIGNONS)
+                               CL_KeepaliveMessage(true);
+                       cl.model_precache[cl.loadmodel_current] = Mod_ForName(cl.model_name[cl.loadmodel_current], false, false, cl.loadmodel_current == 1);
+                       if (cl.model_precache[cl.loadmodel_current] && cl.model_precache[cl.loadmodel_current]->Draw && cl.loadmodel_current == 1)
+                       {
+                               // we now have the worldmodel so we can set up the game world
+                               CL_SetupWorldModel();
+                               if (!cl.loadfinished && cl_joinbeforedownloadsfinish.integer)
+                               {
+                                       cl.loadfinished = true;
+                                       // now issue the spawn to move on to signon 2 like normal
+                                       if (cls.netcon)
+                                               Cmd_ForwardStringToServer("prespawn");
+                               }
+                       }
+               }
+
+               // finished loading models
+       }
+
+       if (cl.loadsound_current < cl.loadsound_total)
+       {
+               // loading sounds
+
+               for (;cl.loadsound_current < cl.loadsound_total;cl.loadsound_current++)
+               {
+                       if (cl.sound_precache[cl.loadsound_current] && S_IsSoundPrecached(cl.sound_precache[cl.loadsound_current]))
+                               continue;
+                       if (cls.signon < SIGNONS)
+                               CL_KeepaliveMessage(true);
+                       // Don't lock the sfx here, S_ServerSounds already did that
+                       cl.sound_precache[cl.loadsound_current] = S_PrecacheSound(cl.sound_name[cl.loadsound_current], false, false);
+               }
+
+               // finished loading sounds
+       }
+
+       // note: the reason these loops skip already-loaded things is that it
+       // enables this command to be issued during the game if desired
+
+       if (cl.downloadmodel_current < cl.loadmodel_total)
+       {
+               // loading models
+
+               for (;cl.downloadmodel_current < cl.loadmodel_total;cl.downloadmodel_current++)
+               {
+                       if (aborteddownload)
+                       {
+                               if (cl.downloadmodel_current == 1)
+                               {
+                                       // the worldmodel failed, but we need to set up anyway
+                                       CL_SetupWorldModel();
+                                       if (!cl.loadfinished && cl_joinbeforedownloadsfinish.integer)
+                                       {
+                                               cl.loadfinished = true;
+                                               // now issue the spawn to move on to signon 2 like normal
+                                               if (cls.netcon)
+                                                       Cmd_ForwardStringToServer("prespawn");
+                                       }
+                               }
+                               aborteddownload = false;
+                               continue;
+                       }
+                       if (cl.model_precache[cl.downloadmodel_current] && cl.model_precache[cl.downloadmodel_current]->Draw)
+                               continue;
+                       if (cls.signon < SIGNONS)
+                               CL_KeepaliveMessage(true);
+                       if (!FS_FileExists(cl.model_name[cl.downloadmodel_current]))
+                       {
+                               if (cl.downloadmodel_current == 1)
+                                       Con_Printf("Map %s not found\n", cl.model_name[cl.downloadmodel_current]);
+                               else
+                                       Con_Printf("Model %s not found\n", cl.model_name[cl.downloadmodel_current]);
+                               // regarding the * check: don't try to download submodels
+                               if (cl_serverextension_download.integer && cls.netcon && cl.model_name[cl.downloadmodel_current][0] != '*' && !sv.active)
+                               {
+                                       Cmd_ForwardStringToServer(va("download %s", cl.model_name[cl.downloadmodel_current]));
+                                       // we'll try loading again when the download finishes
+                                       return;
+                               }
+                       }
+                       cl.model_precache[cl.downloadmodel_current] = Mod_ForName(cl.model_name[cl.downloadmodel_current], false, false, cl.downloadmodel_current == 1);
+                       if (cl.downloadmodel_current == 1)
+                       {
+                               // we now have the worldmodel so we can set up the game world
+                               CL_SetupWorldModel();
+                               if (!cl.loadfinished && cl_joinbeforedownloadsfinish.integer)
+                               {
+                                       cl.loadfinished = true;
+                                       // now issue the spawn to move on to signon 2 like normal
+                                       if (cls.netcon)
+                                               Cmd_ForwardStringToServer("prespawn");
+                               }
+                       }
+               }
+
+               // finished loading models
+       }
+
+       if (cl.downloadsound_current < cl.loadsound_total)
+       {
+               // loading sounds
+
+               for (;cl.downloadsound_current < cl.loadsound_total;cl.downloadsound_current++)
+               {
+                       char soundname[MAX_QPATH];
+                       if (aborteddownload)
+                       {
+                               aborteddownload = false;
+                               continue;
+                       }
+                       if (cl.sound_precache[cl.downloadsound_current] && S_IsSoundPrecached(cl.sound_precache[cl.downloadsound_current]))
+                               continue;
+                       if (cls.signon < SIGNONS)
+                               CL_KeepaliveMessage(true);
+                       dpsnprintf(soundname, sizeof(soundname), "sound/%s", cl.sound_name[cl.downloadsound_current]);
+                       if (!FS_FileExists(soundname) && !FS_FileExists(cl.sound_name[cl.downloadsound_current]))
+                       {
+                               Con_Printf("Sound %s not found\n", soundname);
+                               if (cl_serverextension_download.integer && cls.netcon && !sv.active)
+                               {
+                                       Cmd_ForwardStringToServer(va("download %s", soundname));
+                                       // we'll try loading again when the download finishes
+                                       return;
+                               }
+                       }
+                       // Don't lock the sfx here, S_ServerSounds already did that
+                       cl.sound_precache[cl.downloadsound_current] = S_PrecacheSound(cl.sound_name[cl.downloadsound_current], false, false);
+               }
+
+               // finished loading sounds
+       }
+
+       if (!cl.loadfinished)
+       {
+               cl.loadfinished = true;
+
+               // check memory integrity
+               Mem_CheckSentinelsGlobal();
+
+               // now issue the spawn to move on to signon 2 like normal
+               if (cls.netcon)
+                       Cmd_ForwardStringToServer("prespawn");
+       }
+}
+
+void CL_BeginDownloads_f(void)
+{
+       // prevent cl_begindownloads from being issued multiple times in one match
+       // to prevent accidentally cancelled downloads
+       if(cl.loadbegun)
+               Con_DPrintf("cl_begindownloads is only valid once per match\n");
+       else
+               CL_BeginDownloads(false);
+}
+
+void CL_StopDownload(int size, int crc)
+{
+       if (cls.qw_downloadmemory && cls.qw_downloadmemorycursize == size && CRC_Block(cls.qw_downloadmemory, cls.qw_downloadmemorycursize) == crc)
+       {
+               int existingcrc;
+               size_t existingsize;
+               const char *extension;
+
+               // finished file
+               // save to disk only if we don't already have it
+               // (this is mainly for playing back demos)
+               existingcrc = FS_CRCFile(cls.qw_downloadname, &existingsize);
+               if (existingsize)
+               {
+                       if ((int)existingsize != size || existingcrc != crc)
+                       {
+                               // we have a mismatching file, pick another name for it
+                               char name[MAX_QPATH*2];
+                               dpsnprintf(name, sizeof(name), "dlcache/%s.%i.%i", cls.qw_downloadname, size, crc);
+                               if (!FS_FileExists(name))
+                               {
+                                       Con_Printf("Downloaded \"%s\" (%i bytes, %i CRC)\n", name, size, crc);
+                                       FS_WriteFile(name, cls.qw_downloadmemory, cls.qw_downloadmemorycursize);
+                               }
+                       }
+               }
+               else
+               {
+                       // we either don't have it or have a mismatching file...
+                       // so it's time to accept the file
+                       // but if we already have a mismatching file we need to rename
+                       // this new one, and if we already have this file in renamed form,
+                       // we do nothing
+                       Con_Printf("Downloaded \"%s\" (%i bytes, %i CRC)\n", cls.qw_downloadname, size, crc);
+                       FS_WriteFile(cls.qw_downloadname, cls.qw_downloadmemory, cls.qw_downloadmemorycursize);
+                       extension = FS_FileExtension(cls.qw_downloadname);
+                       if (!strcasecmp(extension, "pak") || !strcasecmp(extension, "pk3"))
+                               FS_Rescan();
+               }
+       }
+       else if (cls.qw_downloadmemory && size)
+       {
+               Con_Printf("Download \"%s\" is corrupt (%i bytes, %i CRC, should be %i bytes, %i CRC), discarding\n", cls.qw_downloadname, size, crc, (int)cls.qw_downloadmemorycursize, (int)CRC_Block(cls.qw_downloadmemory, cls.qw_downloadmemorycursize));
+               CL_BeginDownloads(true);
+       }
+
+       if (cls.qw_downloadmemory)
+               Mem_Free(cls.qw_downloadmemory);
+       cls.qw_downloadmemory = NULL;
+       cls.qw_downloadname[0] = 0;
+       cls.qw_downloadmemorymaxsize = 0;
+       cls.qw_downloadmemorycursize = 0;
+       cls.qw_downloadpercent = 0;
+}
+
+void CL_ParseDownload(void)
+{
+       int i, start, size;
+       unsigned char data[65536];
+       start = MSG_ReadLong();
+       size = (unsigned short)MSG_ReadShort();
+
+       // record the start/size information to ack in the next input packet
+       for (i = 0;i < CL_MAX_DOWNLOADACKS;i++)
+       {
+               if (!cls.dp_downloadack[i].start && !cls.dp_downloadack[i].size)
+               {
+                       cls.dp_downloadack[i].start = start;
+                       cls.dp_downloadack[i].size = size;
+                       break;
+               }
+       }
+
+       MSG_ReadBytes(size, data);
+
+       if (!cls.qw_downloadname[0])
+       {
+               if (size > 0)
+                       Con_Printf("CL_ParseDownload: received %i bytes with no download active\n", size);
+               return;
+       }
+
+       if (start + size > cls.qw_downloadmemorymaxsize)
+               Host_Error("corrupt download message\n");
+
+       // only advance cursize if the data is at the expected position
+       // (gaps are unacceptable)
+       memcpy(cls.qw_downloadmemory + start, data, size);
+       cls.qw_downloadmemorycursize = start + size;
+       cls.qw_downloadpercent = (int)floor((start+size) * 100.0 / cls.qw_downloadmemorymaxsize);
+       cls.qw_downloadpercent = bound(0, cls.qw_downloadpercent, 100);
+       cls.qw_downloadspeedcount += size;
+}
+
+void CL_DownloadBegin_f(void)
+{
+       int size = atoi(Cmd_Argv(1));
+
+       if (size < 0 || size > 1<<30 || FS_CheckNastyPath(Cmd_Argv(2), false))
+       {
+               Con_Printf("cl_downloadbegin: received bogus information\n");
+               CL_StopDownload(0, 0);
+               return;
+       }
+
+       if (cls.qw_downloadname[0])
+               Con_Printf("Download of %s aborted\n", cls.qw_downloadname);
+
+       CL_StopDownload(0, 0);
+
+       // we're really beginning a download now, so initialize stuff
+       strlcpy(cls.qw_downloadname, Cmd_Argv(2), sizeof(cls.qw_downloadname));
+       cls.qw_downloadmemorymaxsize = size;
+       cls.qw_downloadmemory = Mem_Alloc(cls.permanentmempool, cls.qw_downloadmemorymaxsize);
+       cls.qw_downloadnumber++;
+
+       Cmd_ForwardStringToServer("sv_startdownload");
+}
+
+void CL_StopDownload_f(void)
+{
+       if (cls.qw_downloadname[0])
+       {
+               Con_Printf("Download of %s aborted\n", cls.qw_downloadname);
+               CL_StopDownload(0, 0);
+       }
+       CL_BeginDownloads(true);
+}
+
+void CL_DownloadFinished_f(void)
+{
+       if (Cmd_Argc() < 3)
+       {
+               Con_Printf("Malformed cl_downloadfinished command\n");
+               return;
+       }
+       CL_StopDownload(atoi(Cmd_Argv(1)), atoi(Cmd_Argv(2)));
+       CL_BeginDownloads(false);
+}
+
+static void CL_SendPlayerInfo(void)
+{
+       MSG_WriteByte (&cls.netcon->message, clc_stringcmd);
+       MSG_WriteString (&cls.netcon->message, va("name \"%s\"", cl_name.string));
+
+       MSG_WriteByte (&cls.netcon->message, clc_stringcmd);
+       MSG_WriteString (&cls.netcon->message, va("color %i %i", cl_color.integer >> 4, cl_color.integer & 15));
+
+       MSG_WriteByte (&cls.netcon->message, clc_stringcmd);
+       MSG_WriteString (&cls.netcon->message, va("rate %i", cl_rate.integer));
+
+       if (cl_pmodel.integer)
+       {
+               MSG_WriteByte (&cls.netcon->message, clc_stringcmd);
+               MSG_WriteString (&cls.netcon->message, va("pmodel %i", cl_pmodel.integer));
+       }
+       if (*cl_playermodel.string)
+       {
+               MSG_WriteByte (&cls.netcon->message, clc_stringcmd);
+               MSG_WriteString (&cls.netcon->message, va("playermodel %s", cl_playermodel.string));
+       }
+       if (*cl_playerskin.string)
+       {
+               MSG_WriteByte (&cls.netcon->message, clc_stringcmd);
+               MSG_WriteString (&cls.netcon->message, va("playerskin %s", cl_playerskin.string));
+       }
+}
+
 /*
 =====================
 CL_SignonReply
@@ -896,39 +1337,30 @@ static void CL_SignonReply (void)
        case 1:
                if (cls.netcon)
                {
-                       MSG_WriteByte (&cls.netcon->message, clc_stringcmd);
-                       MSG_WriteString (&cls.netcon->message, "prespawn");
+                       // send player info before we begin downloads
+                       // (so that the server can see the player name while downloading)
+                       CL_SendPlayerInfo();
+
+                       // execute cl_begindownloads next frame
+                       // (after any commands added by svc_stufftext have been executed)
+                       // when done with downloads the "prespawn" will be sent
+                       Cbuf_AddText("\ncl_begindownloads\n");
+
+                       //MSG_WriteByte (&cls.netcon->message, clc_stringcmd);
+                       //MSG_WriteString (&cls.netcon->message, "prespawn");
                }
+               else // playing a demo...  make sure loading occurs as soon as possible
+                       CL_BeginDownloads(false);
                break;
 
        case 2:
                if (cls.netcon)
                {
-                       MSG_WriteByte (&cls.netcon->message, clc_stringcmd);
-                       MSG_WriteString (&cls.netcon->message, va("name \"%s\"", cl_name.string));
-
-                       MSG_WriteByte (&cls.netcon->message, clc_stringcmd);
-                       MSG_WriteString (&cls.netcon->message, va("color %i %i", cl_color.integer >> 4, cl_color.integer & 15));
-
-                       if (cl_pmodel.integer)
-                       {
-                               MSG_WriteByte (&cls.netcon->message, clc_stringcmd);
-                               MSG_WriteString (&cls.netcon->message, va("pmodel %i", cl_pmodel.integer));
-                       }
-                       if (*cl_playermodel.string)
-                       {
-                               MSG_WriteByte (&cls.netcon->message, clc_stringcmd);
-                               MSG_WriteString (&cls.netcon->message, va("playermodel %s", cl_playermodel.string));
-                       }
-                       if (*cl_playerskin.string)
-                       {
-                               MSG_WriteByte (&cls.netcon->message, clc_stringcmd);
-                               MSG_WriteString (&cls.netcon->message, va("playerskin %s", cl_playerskin.string));
-                       }
-
-                       MSG_WriteByte (&cls.netcon->message, clc_stringcmd);
-                       MSG_WriteString (&cls.netcon->message, va("rate %i", cl_rate.integer));
+                       // LordHavoc: quake sent the player info here but due to downloads
+                       // it is sent earlier instead
+                       // CL_SendPlayerInfo();
 
+                       // LordHavoc: changed to begin a loading stage and issue this when done
                        MSG_WriteByte (&cls.netcon->message, clc_stringcmd);
                        MSG_WriteString (&cls.netcon->message, "spawn");
                }
@@ -969,6 +1401,9 @@ void CL_ParseServerInfo (void)
        // check memory integrity
        Mem_CheckSentinelsGlobal();
 
+       // clear cl_serverextension cvars
+       Cvar_SetValueQuick(&cl_serverextension_download, 0);
+
 //
 // wipe the client_state_t struct
 //
@@ -992,50 +1427,53 @@ void CL_ParseServerInfo (void)
 
        if (protocol == PROTOCOL_QUAKEWORLD)
        {
+               char gamedir[1][MAX_QPATH];
+
                cl.qw_servercount = MSG_ReadLong();
 
                str = MSG_ReadString();
                Con_Printf("server gamedir is %s\n", str);
-#if 0
-               // FIXME: change gamedir if needed!
-               if (strcasecmp(gamedirfile, str))
-               {
-                       Host_SaveConfig_f();
-                       cflag = 1;
-               }
-
-               Com_Gamedir(str); // change gamedir
+               strlcpy(gamedir[0], str, sizeof(gamedir[0]));
 
-               if (cflag)
-               {
-                       // exec the new config stuff
-               }
-#endif
+               // change gamedir if needed
+               if (!FS_ChangeGameDirs(1, gamedir, true, false))
+                       Host_Error("CL_ParseServerInfo: unable to switch to server specified gamedir");
 
                cl.gametype = GAME_DEATHMATCH;
                cl.maxclients = 32;
 
                // parse player number
                i = MSG_ReadByte();
-               cl.qw_spectator = (i & 128) != 0;
-               cl.playerentity = cl.viewentity = (i & 127) + 1;
+               // cl.qw_spectator is an unneeded flag, cl.scores[cl.playerentity].qw_spectator works better (it can be updated by the server during the game)
+               //cl.qw_spectator = (i & 128) != 0;
+               cl.realplayerentity = cl.playerentity = cl.viewentity = (i & 127) + 1;
                cl.scores = (scoreboard_t *)Mem_Alloc(cls.levelmempool, cl.maxclients*sizeof(*cl.scores));
 
                // get the full level name
                str = MSG_ReadString ();
                strlcpy (cl.levelname, str, sizeof(cl.levelname));
 
-               // get the movevars
-               cl.qw_movevars_gravity            = MSG_ReadFloat();
-               cl.qw_movevars_stopspeed          = MSG_ReadFloat();
-               cl.qw_movevars_maxspeed           = MSG_ReadFloat();
-               cl.qw_movevars_spectatormaxspeed  = MSG_ReadFloat();
-               cl.qw_movevars_accelerate         = MSG_ReadFloat();
-               cl.qw_movevars_airaccelerate      = MSG_ReadFloat();
-               cl.qw_movevars_wateraccelerate    = MSG_ReadFloat();
-               cl.qw_movevars_friction           = MSG_ReadFloat();
-               cl.qw_movevars_waterfriction      = MSG_ReadFloat();
-               cl.qw_movevars_entgravity         = MSG_ReadFloat();
+               // get the movevars that are defined in the qw protocol
+               cl.movevars_gravity            = MSG_ReadFloat();
+               cl.movevars_stopspeed          = MSG_ReadFloat();
+               cl.movevars_maxspeed           = MSG_ReadFloat();
+               cl.movevars_spectatormaxspeed  = MSG_ReadFloat();
+               cl.movevars_accelerate         = MSG_ReadFloat();
+               cl.movevars_airaccelerate      = MSG_ReadFloat();
+               cl.movevars_wateraccelerate    = MSG_ReadFloat();
+               cl.movevars_friction           = MSG_ReadFloat();
+               cl.movevars_waterfriction      = MSG_ReadFloat();
+               cl.movevars_entgravity         = MSG_ReadFloat();
+
+               // other movevars not in the protocol...
+               cl.movevars_wallfriction = 0;
+               cl.movevars_timescale = 1;
+               cl.movevars_jumpvelocity = 270;
+               cl.movevars_edgefriction = 2;
+               cl.movevars_maxairspeed = 30;
+               cl.movevars_stepheight = 18;
+               cl.movevars_airaccel_qw = 1;
+               cl.movevars_airaccel_sideways_friction = 0;
 
                // seperate the printfs so the server message can have a color
                Con_Printf("\n\n\35\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\37\n\n\2%s\n", str);
@@ -1049,6 +1487,9 @@ void CL_ParseServerInfo (void)
                        MSG_WriteString(&cls.netcon->message, va("soundlist %i %i", cl.qw_servercount, 0));
                }
 
+               cl.loadbegun = false;
+               cl.loadfinished = false;
+
                cls.state = ca_connected;
                cls.signon = 1;
 
@@ -1090,7 +1531,7 @@ void CL_ParseServerInfo (void)
                        if (nummodels==MAX_MODELS)
                                Host_Error ("Server sent too many model precaches");
                        if (strlen(str) >= MAX_QPATH)
-                               Host_Error ("Server sent a precache name of %i characters (max %i)", strlen(str), MAX_QPATH - 1);
+                               Host_Error ("Server sent a precache name of %i characters (max %i)", (int)strlen(str), MAX_QPATH - 1);
                        strlcpy (cl.model_name[nummodels], str, sizeof (cl.model_name[nummodels]));
                }
                // parse sound precache list
@@ -1102,13 +1543,14 @@ void CL_ParseServerInfo (void)
                        if (numsounds==MAX_SOUNDS)
                                Host_Error("Server sent too many sound precaches");
                        if (strlen(str) >= MAX_QPATH)
-                               Host_Error("Server sent a precache name of %i characters (max %i)", strlen(str), MAX_QPATH - 1);
+                               Host_Error("Server sent a precache name of %i characters (max %i)", (int)strlen(str), MAX_QPATH - 1);
                        strlcpy (cl.sound_name[numsounds], str, sizeof (cl.sound_name[numsounds]));
                }
 
                // touch all of the precached models that are still loaded so we can free
                // anything that isn't needed
-               Mod_ClearUsed();
+               if (!sv.active)
+                       Mod_ClearUsed();
                for (i = 1;i < nummodels;i++)
                        Mod_FindName(cl.model_name[i]);
                // precache any models used by the client (this also marks them used)
@@ -1132,37 +1574,50 @@ void CL_ParseServerInfo (void)
                cl.sfx_r_exp3 = S_PrecacheSound(cl_sound_r_exp3.string, false, true);
 
                // now we try to load everything that is new
+               cl.loadmodel_current = 1;
+               cl.downloadmodel_current = 1;
+               cl.loadmodel_total = nummodels;
+               cl.loadsound_current = 1;
+               cl.downloadsound_current = 1;
+               cl.loadsound_total = numsounds;
+               cl.downloadcsqc = true;
+               cl.loadbegun = false;
+               cl.loadfinished = false;
+       }
 
-               // world model
-               CL_KeepaliveMessage ();
-               cl.model_precache[1] = Mod_ForName(cl.model_name[1], false, false, true);
-               if (cl.model_precache[1]->Draw == NULL)
-                       Con_Printf("Map %s not found\n", cl.model_name[1]);
+       // check memory integrity
+       Mem_CheckSentinelsGlobal();
 
-               // normal models
-               for (i=2 ; i<nummodels ; i++)
+// if cl_autodemo is set, automatically start recording a demo if one isn't being recorded already
+       if (cl_autodemo.integer && cls.netcon && cls.protocol != PROTOCOL_QUAKEWORLD)
+       {
+               char demofile[MAX_OSPATH];
+               char levelname[MAX_QPATH];
+
+               if (cls.demorecording)
                {
-                       CL_KeepaliveMessage();
-                       if ((cl.model_precache[i] = Mod_ForName(cl.model_name[i], false, false, false))->Draw == NULL)
-                               Con_Printf("Model %s not found\n", cl.model_name[i]);
+                       // finish the previous level's demo file
+                       CL_Stop_f();
                }
 
-               // sounds
-               for (i=1 ; i<numsounds ; i++)
+               // start a new demo file
+               strlcpy(levelname, FS_FileWithoutPath(cl.model_name[1]), sizeof(levelname));
+               if (strrchr(levelname, '.'))
+                       *(strrchr(levelname, '.')) = 0;
+               dpsnprintf (demofile, sizeof(demofile), "%s_%s.dem", Sys_TimeString (cl_autodemo_nameformat.string), levelname);
+
+               Con_Printf ("Auto-recording to %s.\n", demofile);
+
+               cls.demofile = FS_Open (demofile, "wb", false, false);
+               if (cls.demofile)
                {
-                       CL_KeepaliveMessage();
-                       // Don't lock the sfx here, S_ServerSounds already did that
-                       cl.sound_precache[i] = S_PrecacheSound (cl.sound_name[i], true, false);
+                       cls.forcetrack = -1;
+                       FS_Printf (cls.demofile, "%i\n", cls.forcetrack);
+                       cls.demorecording = true;
                }
-
-               // we now have the worldmodel so we can set up the game world
-               cl.entities[0].render.model = cl.worldmodel = cl.model_precache[1];
-               CL_BoundingBoxForEntity(&cl.entities[0].render);
-               R_Modules_NewMap();
+               else
+                       Con_Print ("ERROR: couldn't open.\n");
        }
-
-       // check memory integrity
-       Mem_CheckSentinelsGlobal();
 }
 
 void CL_ValidateState(entity_state_t *s)
@@ -1172,7 +1627,7 @@ void CL_ValidateState(entity_state_t *s)
        if (!s->active)
                return;
 
-       if (s->modelindex >= MAX_MODELS && (65536-s->modelindex) >= MAX_MODELS)
+       if (s->modelindex >= MAX_MODELS)
                Host_Error("CL_ValidateState: modelindex (%i) >= MAX_MODELS (%i)\n", s->modelindex, MAX_MODELS);
 
        // colormap is client index + 1
@@ -1211,14 +1666,14 @@ void CL_MoveLerpEntityStates(entity_t *ent)
                VectorCopy(ent->state_current.origin, ent->persistent.neworigin);
                VectorCopy(ent->state_current.angles, ent->persistent.newangles);
                // reset animation interpolation as well
-               ent->render.frame = ent->render.frame1 = ent->render.frame2 = ent->state_current.frame;
+               ent->render.frame1 = ent->render.frame2 = ent->state_current.frame;
                ent->render.frame1time = ent->render.frame2time = cl.time;
                ent->render.framelerp = 1;
                // reset various persistent stuff
                ent->persistent.muzzleflash = 0;
-               VectorCopy(ent->state_current.origin, ent->persistent.trail_origin);
+               ent->persistent.trail_allowed = false;
        }
-       else if (cls.timedemo || cl_nolerp.integer || DotProduct(odelta, odelta) > 1000*1000 || (cl.fixangle[0] && !cl.fixangle[1]))
+       else if (DotProduct(odelta, odelta) > 1000*1000 || (cl.fixangle[0] && !cl.fixangle[1]))
        {
                // don't interpolate the move
                // (the fixangle[] check detects teleports, but not constant fixangles
@@ -1229,6 +1684,7 @@ void CL_MoveLerpEntityStates(entity_t *ent)
                VectorCopy(ent->state_current.angles, ent->persistent.oldangles);
                VectorCopy(ent->state_current.origin, ent->persistent.neworigin);
                VectorCopy(ent->state_current.angles, ent->persistent.newangles);
+               ent->persistent.trail_allowed = false;
        }
        else if (ent->state_current.flags & RENDER_STEP)
        {
@@ -1257,6 +1713,9 @@ void CL_MoveLerpEntityStates(entity_t *ent)
                VectorCopy(ent->state_current.origin, ent->persistent.neworigin);
                VectorCopy(ent->state_current.angles, ent->persistent.newangles);
        }
+       // trigger muzzleflash effect if necessary
+       if (ent->state_current.effects & EF_MUZZLEFLASH)
+               ent->persistent.muzzleflash = 1;
 }
 
 /*
@@ -1288,7 +1747,6 @@ void CL_ParseBaseline (entity_t *ent, int large)
                ent->state_baseline.origin[i] = MSG_ReadCoord(cls.protocol);
                ent->state_baseline.angles[i] = MSG_ReadAngle(cls.protocol);
        }
-       CL_ValidateState(&ent->state_baseline);
        ent->state_previous = ent->state_current = ent->state_baseline;
 }
 
@@ -1369,7 +1827,6 @@ void CL_ParseClientdata (void)
                cl.stats[STAT_ITEMS] = MSG_ReadLong ();
 
        cl.onground = (bits & SU_ONGROUND) != 0;
-       csqc_onground = cl.onground;    //[515]: cause without this csqc will receive not right value on svc_print =/
        cl.inwater = (bits & SU_INWATER) != 0;
 
        if (cls.protocol == PROTOCOL_DARKPLACES5)
@@ -1428,9 +1885,17 @@ void CL_ParseStatic (int large)
        ent = &cl.static_entities[cl.num_static_entities++];
        CL_ParseBaseline (ent, large);
 
+       if (ent->state_baseline.modelindex == 0)
+       {
+               Con_DPrintf("svc_parsestatic: static entity without model at %f %f %f\n", ent->state_baseline.origin[0], ent->state_baseline.origin[1], ent->state_baseline.origin[2]);
+               cl.num_static_entities--;
+               // This is definitely a cheesy way to conserve resources...
+               return;
+       }
+
 // copy it to the current state
        ent->render.model = cl.model_precache[ent->state_baseline.modelindex];
-       ent->render.frame = ent->render.frame1 = ent->render.frame2 = ent->state_baseline.frame;
+       ent->render.frame1 = ent->render.frame2 = ent->state_baseline.frame;
        ent->render.framelerp = 0;
        // make torchs play out of sync
        ent->render.frame1time = ent->render.frame2time = lhrandom(-10, -1);
@@ -1438,18 +1903,12 @@ void CL_ParseStatic (int large)
        ent->render.skinnum = ent->state_baseline.skin;
        ent->render.effects = ent->state_baseline.effects;
        ent->render.alpha = 1;
-       //ent->render.scale = 1;
 
        //VectorCopy (ent->state_baseline.origin, ent->render.origin);
        //VectorCopy (ent->state_baseline.angles, ent->render.angles);
 
        Matrix4x4_CreateFromQuakeEntity(&ent->render.matrix, ent->state_baseline.origin[0], ent->state_baseline.origin[1], ent->state_baseline.origin[2], ent->state_baseline.angles[0], ent->state_baseline.angles[1], ent->state_baseline.angles[2], 1);
-       Matrix4x4_Invert_Simple(&ent->render.inversematrix, &ent->render.matrix);
-       CL_BoundingBoxForEntity(&ent->render);
-
-       // This is definitely cheating...
-       if (ent->render.model == NULL)
-               cl.num_static_entities--;
+       CL_UpdateRenderEntity(&ent->render);
 }
 
 /*
@@ -1679,6 +2138,21 @@ void CL_ParseTempEntity(void)
                        VectorSet(pos2, pos[0] + radius, pos[1] + radius, pos[2] + radius);
                        VectorSet(pos, pos[0] - radius, pos[1] - radius, pos[2] - radius);
                        CL_ParticleEffect(EFFECT_TE_GUNSHOT, radius, pos, pos2, vec3_origin, vec3_origin, NULL, 0);
+                       if(cl_sound_ric_gunshot.integer & RIC_GUNSHOT)
+                       {
+                               if (rand() % 5)
+                                       S_StartSound(-1, 0, cl.sfx_tink1, pos, 1, 1);
+                               else
+                               {
+                                       rnd = rand() & 3;
+                                       if (rnd == 1)
+                                               S_StartSound(-1, 0, cl.sfx_ric1, pos, 1, 1);
+                                       else if (rnd == 2)
+                                               S_StartSound(-1, 0, cl.sfx_ric2, pos, 1, 1);
+                                       else
+                                               S_StartSound(-1, 0, cl.sfx_ric3, pos, 1, 1);
+                               }
+                       }
                        break;
 
                case QW_TE_BLOOD:
@@ -1870,6 +2344,21 @@ void CL_ParseTempEntity(void)
                        MSG_ReadVector(pos, cls.protocol);
                        CL_FindNonSolidLocation(pos, pos, 4);
                        CL_ParticleEffect(EFFECT_TE_GUNSHOT, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0);
+                       if(cl_sound_ric_gunshot.integer & RIC_GUNSHOT)
+                       {
+                               if (rand() % 5)
+                                       S_StartSound(-1, 0, cl.sfx_tink1, pos, 1, 1);
+                               else
+                               {
+                                       rnd = rand() & 3;
+                                       if (rnd == 1)
+                                               S_StartSound(-1, 0, cl.sfx_ric1, pos, 1, 1);
+                                       else if (rnd == 2)
+                                               S_StartSound(-1, 0, cl.sfx_ric2, pos, 1, 1);
+                                       else
+                                               S_StartSound(-1, 0, cl.sfx_ric3, pos, 1, 1);
+                               }
+                       }
                        break;
 
                case TE_GUNSHOTQUAD:
@@ -1877,6 +2366,21 @@ void CL_ParseTempEntity(void)
                        MSG_ReadVector(pos, cls.protocol);
                        CL_FindNonSolidLocation(pos, pos, 4);
                        CL_ParticleEffect(EFFECT_TE_GUNSHOTQUAD, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0);
+                       if(cl_sound_ric_gunshot.integer & RIC_GUNSHOTQUAD)
+                       {
+                               if (rand() % 5)
+                                       S_StartSound(-1, 0, cl.sfx_tink1, pos, 1, 1);
+                               else
+                               {
+                                       rnd = rand() & 3;
+                                       if (rnd == 1)
+                                               S_StartSound(-1, 0, cl.sfx_ric1, pos, 1, 1);
+                                       else if (rnd == 2)
+                                               S_StartSound(-1, 0, cl.sfx_ric2, pos, 1, 1);
+                                       else
+                                               S_StartSound(-1, 0, cl.sfx_ric3, pos, 1, 1);
+                               }
+                       }
                        break;
 
                case TE_EXPLOSION:
@@ -1904,7 +2408,7 @@ void CL_ParseTempEntity(void)
                        color[2] = MSG_ReadCoord(cls.protocol) * (2.0f / 1.0f);
                        CL_ParticleExplosion(pos);
                        Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
-                       CL_AllocDlight(NULL, &tempmatrix, 350, color[0], color[1], color[2], 700, 0.5, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+                       CL_AllocLightFlash(NULL, &tempmatrix, 350, color[0], color[1], color[2], 700, 0.5, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
                        S_StartSound(-1, 0, cl.sfx_r_exp3, pos, 1, 1);
                        break;
 
@@ -1917,7 +2421,7 @@ void CL_ParseTempEntity(void)
                        color[1] = MSG_ReadByte() * (2.0f / 255.0f);
                        color[2] = MSG_ReadByte() * (2.0f / 255.0f);
                        Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
-                       CL_AllocDlight(NULL, &tempmatrix, 350, color[0], color[1], color[2], 700, 0.5, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+                       CL_AllocLightFlash(NULL, &tempmatrix, 350, color[0], color[1], color[2], 700, 0.5, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
                        S_StartSound(-1, 0, cl.sfx_r_exp3, pos, 1, 1);
                        break;
 
@@ -1944,7 +2448,7 @@ void CL_ParseTempEntity(void)
                        color[1] = MSG_ReadByte() * (2.0f / 255.0f);
                        color[2] = MSG_ReadByte() * (2.0f / 255.0f);
                        Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
-                       CL_AllocDlight(NULL, &tempmatrix, radius, color[0], color[1], color[2], radius / velspeed, velspeed, 0, -1, true, 1, 0.25, 1, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+                       CL_AllocLightFlash(NULL, &tempmatrix, radius, color[0], color[1], color[2], radius / velspeed, velspeed, 0, -1, true, 1, 0.25, 1, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
                        break;
 
                case TE_FLAMEJET:
@@ -2003,7 +2507,7 @@ void CL_ParseTempEntity(void)
                        color[1] = tempcolor[1] * (2.0f / 255.0f);
                        color[2] = tempcolor[2] * (2.0f / 255.0f);
                        Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
-                       CL_AllocDlight(NULL, &tempmatrix, 350, color[0], color[1], color[2], 700, 0.5, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+                       CL_AllocLightFlash(NULL, &tempmatrix, 350, color[0], color[1], color[2], 700, 0.5, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
                        S_StartSound(-1, 0, cl.sfx_r_exp3, pos, 1, 1);
                        break;
 
@@ -2043,19 +2547,217 @@ void CL_ParseTempEntity(void)
        }
 }
 
+void CL_ParseTrailParticles(void)
+{
+       int entityindex;
+       int effectindex;
+       vec3_t start, end;
+       entityindex = (unsigned short)MSG_ReadShort();
+       if (entityindex >= MAX_EDICTS)
+               entityindex = 0;
+       if (entityindex >= cl.max_entities)
+               CL_ExpandEntities(entityindex);
+       effectindex = (unsigned short)MSG_ReadShort();
+       MSG_ReadVector(start, cls.protocol);
+       MSG_ReadVector(end, cls.protocol);
+       CL_ParticleEffect(effectindex, VectorDistance(start, end), start, end, vec3_origin, vec3_origin, entityindex > 0 ? cl.entities + entityindex : NULL, 0);
+}
+
+void CL_ParsePointParticles(void)
+{
+       int effectindex, count;
+       vec3_t origin, velocity;
+       effectindex = (unsigned short)MSG_ReadShort();
+       MSG_ReadVector(origin, cls.protocol);
+       MSG_ReadVector(velocity, cls.protocol);
+       count = (unsigned short)MSG_ReadShort();
+       CL_ParticleEffect(effectindex, count, origin, origin, velocity, velocity, NULL, 0);
+}
+
+void CL_ParsePointParticles1(void)
+{
+       int effectindex;
+       vec3_t origin;
+       effectindex = (unsigned short)MSG_ReadShort();
+       MSG_ReadVector(origin, cls.protocol);
+       CL_ParticleEffect(effectindex, 1, origin, origin, vec3_origin, vec3_origin, NULL, 0);
+}
+
+typedef struct cl_iplog_item_s
+{
+       char *address;
+       char *name;
+}
+cl_iplog_item_t;
+
+static qboolean cl_iplog_loaded = false;
+static int cl_iplog_numitems = 0;
+static int cl_iplog_maxitems = 0;
+static cl_iplog_item_t *cl_iplog_items;
+
+static void CL_IPLog_Load(void);
+static void CL_IPLog_Add(const char *address, const char *name, qboolean checkexisting, qboolean addtofile)
+{
+       int i;
+       if (!address || !address[0] || !name || !name[0])
+               return;
+       if (!cl_iplog_loaded)
+               CL_IPLog_Load();
+       if (developer.integer >= 100)
+               Con_Printf("CL_IPLog_Add(\"%s\", \"%s\", %i, %i);\n", address, name, checkexisting, addtofile);
+       // see if it already exists
+       if (checkexisting)
+       {
+               for (i = 0;i < cl_iplog_numitems;i++)
+               {
+                       if (!strcmp(cl_iplog_items[i].address, address) && !strcmp(cl_iplog_items[i].name, name))
+                       {
+                               if (developer.integer >= 100)
+                                       Con_Printf("... found existing \"%s\" \"%s\"\n", cl_iplog_items[i].address, cl_iplog_items[i].name);
+                               return;
+                       }
+               }
+       }
+       // it does not already exist in the iplog, so add it
+       if (cl_iplog_maxitems <= cl_iplog_numitems || !cl_iplog_items)
+       {
+               cl_iplog_item_t *olditems = cl_iplog_items;
+               cl_iplog_maxitems = max(1024, cl_iplog_maxitems + 256);
+               cl_iplog_items = Mem_Alloc(cls.permanentmempool, cl_iplog_maxitems * sizeof(cl_iplog_item_t));
+               if (olditems)
+               {
+                       if (cl_iplog_numitems)
+                               memcpy(cl_iplog_items, olditems, cl_iplog_numitems * sizeof(cl_iplog_item_t));
+                       Mem_Free(olditems);
+               }
+       }
+       cl_iplog_items[cl_iplog_numitems].address = Mem_Alloc(cls.permanentmempool, strlen(address) + 1);
+       cl_iplog_items[cl_iplog_numitems].name = Mem_Alloc(cls.permanentmempool, strlen(name) + 1);
+       strlcpy(cl_iplog_items[cl_iplog_numitems].address, address, strlen(address) + 1);
+       // TODO: maybe it would be better to strip weird characters from name when
+       // copying it here rather than using a straight strcpy?
+       strlcpy(cl_iplog_items[cl_iplog_numitems].name, name, strlen(name) + 1);
+       cl_iplog_numitems++;
+       if (addtofile)
+       {
+               // add it to the iplog.txt file
+               // TODO: this ought to open the one in the userpath version of the base
+               // gamedir, not the current gamedir
+               Log_Printf(cl_iplog_name.string, "%s %s\n", address, name);
+               if (developer.integer >= 100)
+                       Con_Printf("CL_IPLog_Add: appending this line to %s: %s %s\n", cl_iplog_name.string, address, name);
+       }
+}
+
+static void CL_IPLog_Load(void)
+{
+       int i, len, linenumber;
+       char *text, *textend;
+       unsigned char *filedata;
+       fs_offset_t filesize;
+       char line[MAX_INPUTLINE];
+       char address[MAX_INPUTLINE];
+       cl_iplog_loaded = true;
+       // TODO: this ought to open the one in the userpath version of the base
+       // gamedir, not the current gamedir
+       filedata = FS_LoadFile(cl_iplog_name.string, tempmempool, true, &filesize);
+       if (!filedata)
+               return;
+       text = (char *)filedata;
+       textend = text + filesize;
+       for (linenumber = 1;text < textend;linenumber++)
+       {
+               for (len = 0;text < textend && *text != '\r' && *text != '\n';text++)
+                       if (len < (int)sizeof(line) - 1)
+                               line[len++] = *text;
+               line[len] = 0;
+               if (text < textend && *text == '\r' && text[1] == '\n')
+                       text++;
+               if (text < textend && *text == '\n')
+                       text++;
+               if (line[0] == '/' && line[1] == '/')
+                       continue; // skip comments if anyone happens to add them
+               for (i = 0;i < len && line[i] > ' ';i++)
+                       address[i] = line[i];
+               address[i] = 0;
+               // skip exactly one space character
+               i++;
+               // address contains the address with termination,
+               // line + i contains the name with termination
+               if (address[0] && line[i])
+                       CL_IPLog_Add(address, line + i, false, false);
+               else
+                       Con_Printf("%s:%i: could not parse address and name:\n%s\n", cl_iplog_name.string, linenumber, line);
+       }
+}
+
+static void CL_IPLog_List_f(void)
+{
+       int i, j;
+       const char *addressprefix;
+       if (Cmd_Argc() > 2)
+       {
+               Con_Printf("usage: %s 123.456.789.\n", Cmd_Argv(0));
+               return;
+       }
+       addressprefix = "";
+       if (Cmd_Argc() >= 2)
+               addressprefix = Cmd_Argv(1);
+       if (!cl_iplog_loaded)
+               CL_IPLog_Load();
+       if (addressprefix && addressprefix[0])
+               Con_Printf("Listing iplog addresses beginning with %s\n", addressprefix);
+       else
+               Con_Printf("Listing all iplog entries\n");
+       Con_Printf("address         name\n");
+       for (i = 0;i < cl_iplog_numitems;i++)
+       {
+               if (addressprefix && addressprefix[0])
+               {
+                       for (j = 0;addressprefix[j];j++)
+                               if (addressprefix[j] != cl_iplog_items[i].address[j])
+                                       break;
+                       // if this address does not begin with the addressprefix string
+                       // simply omit it from the output
+                       if (addressprefix[j])
+                               continue;
+               }
+               // if name is less than 15 characters, left justify it and pad
+               // if name is more than 15 characters, print all of it, not worrying
+               // about the fact it will misalign the columns
+               if (strlen(cl_iplog_items[i].address) < 15)
+                       Con_Printf("%-15s %s\n", cl_iplog_items[i].address, cl_iplog_items[i].name);
+               else
+                       Con_Printf("%5s %s\n", cl_iplog_items[i].address, cl_iplog_items[i].name);
+       }
+}
+
 // look for anything interesting like player IP addresses or ping reports
 qboolean CL_ExaminePrintString(const char *text)
 {
+       int len;
        const char *t;
+       char temp[MAX_INPUTLINE];
        if (!strcmp(text, "Client ping times:\n"))
        {
                cl.parsingtextmode = CL_PARSETEXTMODE_PING;
-               cl.parsingtextplayerindex = 0;
+               // hide ping reports in demos
+               if (cls.demoplayback)
+                       cl.parsingtextexpectingpingforscores = 1;
+               for(cl.parsingtextplayerindex = 0; cl.parsingtextplayerindex < cl.maxclients && !cl.scores[cl.parsingtextplayerindex].name[0]; cl.parsingtextplayerindex++)
+                       ;
+               if (cl.parsingtextplayerindex >= cl.maxclients) // should never happen, since the client itself should be in cl.scores
+               {
+                       Con_Printf("ping reply but empty scoreboard?!?\n");
+                       cl.parsingtextmode = CL_PARSETEXTMODE_NONE;
+                       cl.parsingtextexpectingpingforscores = 0;
+               }
+               cl.parsingtextexpectingpingforscores = cl.parsingtextexpectingpingforscores ? 2 : 0;
                return !cl.parsingtextexpectingpingforscores;
        }
        if (!strncmp(text, "host:    ", 9))
        {
-               cl.parsingtextexpectingpingforscores = false;
+               // cl.parsingtextexpectingpingforscores = false; // really?
                cl.parsingtextmode = CL_PARSETEXTMODE_STATUS;
                cl.parsingtextplayerindex = 0;
                return true;
@@ -2064,35 +2766,49 @@ qboolean CL_ExaminePrintString(const char *text)
        {
                // if anything goes wrong, we'll assume this is not a ping report
                qboolean expected = cl.parsingtextexpectingpingforscores;
-               cl.parsingtextexpectingpingforscores = false;
+               cl.parsingtextexpectingpingforscores = 0;
                cl.parsingtextmode = CL_PARSETEXTMODE_NONE;
                t = text;
                while (*t == ' ')
                        t++;
-               if (*t >= '0' && *t <= '9')
+               if ((*t >= '0' && *t <= '9') || *t == '-')
                {
                        int ping = atoi(t);
-                       while (*t >= '0' && *t <= '9')
+                       while ((*t >= '0' && *t <= '9') || *t == '-')
                                t++;
                        if (*t == ' ')
                        {
                                int charindex = 0;
                                t++;
-                               for (charindex = 0;cl.scores[cl.parsingtextplayerindex].name[charindex] == t[charindex];charindex++)
-                                       ;
-                               if (cl.scores[cl.parsingtextplayerindex].name[charindex] == 0 && t[charindex] == '\n')
+                               if(cl.parsingtextplayerindex < cl.maxclients)
                                {
-                                       cl.scores[cl.parsingtextplayerindex].qw_ping = bound(0, ping, 9999);
-                                       for (cl.parsingtextplayerindex++;cl.parsingtextplayerindex < cl.maxclients && !cl.scores[cl.parsingtextplayerindex].name[0];cl.parsingtextplayerindex++)
+                                       for (charindex = 0;cl.scores[cl.parsingtextplayerindex].name[charindex] == t[charindex];charindex++)
                                                ;
-                                       if (cl.parsingtextplayerindex < cl.maxclients)
+                                       // note: the matching algorithm stops at the end of the player name because some servers append text such as " READY" after the player name in the scoreboard but not in the ping report
+                                       //if (cl.scores[cl.parsingtextplayerindex].name[charindex] == 0 && t[charindex] == '\n')
+                                       if (t[charindex] == '\n')
                                        {
-                                               // we parsed a valid ping entry, so expect another to follow
-                                               cl.parsingtextmode = CL_PARSETEXTMODE_PING;
-                                               cl.parsingtextexpectingpingforscores = expected;
+                                               cl.scores[cl.parsingtextplayerindex].qw_ping = bound(0, ping, 9999);
+                                               for (cl.parsingtextplayerindex++;cl.parsingtextplayerindex < cl.maxclients && !cl.scores[cl.parsingtextplayerindex].name[0];cl.parsingtextplayerindex++)
+                                                       ;
+                                               //if (cl.parsingtextplayerindex < cl.maxclients) // we could still get unconnecteds!
+                                               {
+                                                       // we parsed a valid ping entry, so expect another to follow
+                                                       cl.parsingtextmode = CL_PARSETEXTMODE_PING;
+                                                       cl.parsingtextexpectingpingforscores = expected;
+                                               }
+                                               return !expected;
                                        }
+                               }
+                               if (!strncmp(t, "unconnected\n", 12))
+                               {
+                                       // just ignore
+                                       cl.parsingtextmode = CL_PARSETEXTMODE_PING;
+                                       cl.parsingtextexpectingpingforscores = expected;
                                        return !expected;
                                }
+                               else
+                                       Con_DPrintf("player names '%s' and '%s' didn't match\n", cl.scores[cl.parsingtextplayerindex].name, t);
                        }
                }
        }
@@ -2117,7 +2833,7 @@ qboolean CL_ExaminePrintString(const char *text)
                if (text[0] == '#' && text[1] >= '0' && text[1] <= '9')
                {
                        t = text + 1;
-                       cl.parsingtextplayerindex = atoi(t);
+                       cl.parsingtextplayerindex = atoi(t) - 1;
                        while (*t >= '0' && *t <= '9')
                                t++;
                        if (*t == ' ')
@@ -2125,6 +2841,7 @@ qboolean CL_ExaminePrintString(const char *text)
                                cl.parsingtextmode = CL_PARSETEXTMODE_STATUS_PLAYERIP;
                                return true;
                        }
+                       // the player name follows here, along with frags and time
                }
        }
        if (cl.parsingtextmode == CL_PARSETEXTMODE_STATUS_PLAYERIP)
@@ -2136,12 +2853,21 @@ qboolean CL_ExaminePrintString(const char *text)
                        t = text;
                        while (*t == ' ')
                                t++;
+                       for (len = 0;*t && *t != '\n';t++)
+                               if (len < (int)sizeof(temp) - 1)
+                                       temp[len++] = *t;
+                       temp[len] = 0;
                        // botclient is perfectly valid, but we don't care about bots
-                       if (strcmp(t, "botclient\n"))
+                       // also don't try to look up the name of an invalid player index
+                       if (strcmp(temp, "botclient")
+                        && cl.parsingtextplayerindex >= 0
+                        && cl.parsingtextplayerindex < cl.maxclients
+                        && cl.scores[cl.parsingtextplayerindex].name[0])
                        {
-                               lhnetaddress_t address;
-                               LHNETADDRESS_FromString(&address, t, 0);
-                               // TODO: log the IP address and player name?
+                               // log the player name and IP address string
+                               // (this operates entirely on strings to avoid issues with the
+                               //  nature of a network address)
+                               CL_IPLog_Add(temp, cl.scores[cl.parsingtextplayerindex].name, true, true);
                        }
                        cl.parsingtextmode = CL_PARSETEXTMODE_STATUS_PLAYERID;
                        return true;
@@ -2150,10 +2876,81 @@ qboolean CL_ExaminePrintString(const char *text)
        return true;
 }
 
+extern cvar_t slowmo;
+static void CL_NetworkTimeReceived(double newtime)
+{
+       double timehigh;
+       cl.mtime[1] = cl.mtime[0];
+       cl.mtime[0] = newtime;
+       if (cls.timedemo || (cl.islocalgame && !sv_fixedframeratesingleplayer.integer) || cl.mtime[1] == cl.mtime[0] || cls.signon < SIGNONS)
+               cl.time = cl.mtime[1] = newtime;
+       else if (cls.protocol != PROTOCOL_QUAKEWORLD && !cls.demoplayback)
+       {
+               cl.mtime[1] = max(cl.mtime[1], cl.mtime[0] - 0.1);
+               if (developer.integer >= 100 && vid_activewindow)
+               {
+                       if (cl.time < cl.mtime[1] - (cl.mtime[0] - cl.mtime[1]))
+                               Con_Printf("--- cl.time < cl.mtime[1] (%f < %f ... %f)\n", cl.time, cl.mtime[1], cl.mtime[0]);
+                       else if (cl.time > cl.mtime[0] + (cl.mtime[0] - cl.mtime[1]))
+                               Con_Printf("--- cl.time > cl.mtime[0] (%f > %f ... %f)\n", cl.time, cl.mtime[1], cl.mtime[0]);
+               }
+               cl.time += (cl.mtime[1] - cl.time) * bound(0, cl_nettimesyncfactor.value, 1);
+               timehigh = cl.mtime[1] + (cl.mtime[0] - cl.mtime[1]) * cl_nettimesyncboundtolerance.value;
+               if (cl_nettimesyncboundmode.integer == 1)
+                       cl.time = bound(cl.mtime[1], cl.time, cl.mtime[0]);
+               else if (cl_nettimesyncboundmode.integer == 2)
+               {
+                       if (cl.time < cl.mtime[1] || cl.time > timehigh)
+                               cl.time = cl.mtime[1];
+               }
+               else if (cl_nettimesyncboundmode.integer == 3)
+               {
+                       if ((cl.time < cl.mtime[1] && cl.oldtime < cl.mtime[1]) || (cl.time > timehigh && cl.oldtime > timehigh))
+                               cl.time = cl.mtime[1];
+               }
+               else if (cl_nettimesyncboundmode.integer == 4)
+               {
+                       if (fabs(cl.time - cl.mtime[1]) > 0.5)
+                               cl.time = cl.mtime[1]; // reset
+                       else if (fabs(cl.time - cl.mtime[1]) > 0.1)
+                               cl.time += 0.5 * (cl.mtime[1] - cl.time); // fast
+                       else if (cl.time > cl.mtime[1])
+                               cl.time -= 0.002 * cl.movevars_timescale; // fall into the past by 2ms
+                       else
+                               cl.time += 0.001 * cl.movevars_timescale; // creep forward 1ms
+               }
+               else if (cl_nettimesyncboundmode.integer == 5)
+               {
+                       if (fabs(cl.time - cl.mtime[1]) > 0.5)
+                               cl.time = cl.mtime[1]; // reset
+                       else if (fabs(cl.time - cl.mtime[1]) > 0.1)
+                               cl.time += 0.5 * (cl.mtime[1] - cl.time); // fast
+                       else
+                               cl.time = bound(cl.time - 0.002 * cl.movevars_timescale, cl.mtime[1], cl.time + 0.001 * cl.movevars_timescale);
+               }
+               else if (cl_nettimesyncboundmode.integer == 6)
+               {
+                       cl.time = bound(cl.mtime[1], cl.time, cl.mtime[0]);
+                       cl.time = bound(cl.time - 0.002 * cl.movevars_timescale, cl.mtime[1], cl.time + 0.001 * cl.movevars_timescale);
+               }
+       }
+       // this packet probably contains a player entity update, so we will need
+       // to update the prediction
+       cl.movement_needupdate = true;
+       // this may get updated later in parsing by svc_clientdata
+       cl.onground = false;
+       // if true the cl.viewangles are interpolated from cl.mviewangles[]
+       // during this frame
+       // (makes spectating players much smoother and prevents mouse movement from turning)
+       cl.fixangle[1] = cl.fixangle[0];
+       cl.fixangle[0] = false;
+       if (!cls.demoplayback)
+               VectorCopy(cl.mviewangles[0], cl.mviewangles[1]);
+}
+
 #define SHOWNET(x) if(cl_shownet.integer==2)Con_Printf("%3i:%s\n", msg_readcount-1, x);
 
 //[515]: csqc
-void CL_VM_Init (void);
 qboolean CL_VM_Parse_TempEntity (void);
 void CL_VM_Parse_StuffCmd (const char *msg);
 void CL_VM_Parse_CenterPrint (const char *msg);
@@ -2166,6 +2963,7 @@ CL_ParseServerMessage
 =====================
 */
 int parsingerror = false;
+extern void CL_UpdateMoveVars(void);
 void CL_ParseServerMessage(void)
 {
        int                     cmd;
@@ -2175,11 +2973,17 @@ void CL_ParseServerMessage(void)
        char            *cmdlogname[32], *temp;
        int                     cmdindex, cmdcount = 0;
 
-       if (cls.demorecording)
-               CL_WriteDemoMessage ();
+       // LordHavoc: moved demo message writing from before the packet parse to
+       // after the packet parse so that CL_Stop_f can be called by cl_autodemo
+       // code in CL_ParseServerinfo
+       //if (cls.demorecording)
+       //      CL_WriteDemoMessage (&net_message);
 
        cl.last_received_message = realtime;
 
+       if (cls.netcon && cls.signon < SIGNONS)
+               CL_KeepaliveMessage(false);
+
 //
 // if recording demos, copy the message out
 //
@@ -2197,16 +3001,7 @@ void CL_ParseServerMessage(void)
 
        if (cls.protocol == PROTOCOL_QUAKEWORLD)
        {
-               cl.mtime[1] = cl.mtime[0];
-               cl.mtime[0] = realtime; // qw has no clock
-               cl.movement_needupdate = true;
-               // if true the cl.viewangles are interpolated from cl.mviewangles[]
-               // during this frame
-               // (makes spectating players much smoother and prevents mouse movement from turning)
-               cl.fixangle[1] = cl.fixangle[0];
-               cl.fixangle[0] = false;
-               if (!cls.demoplayback)
-                       VectorCopy(cl.mviewangles[0], cl.mviewangles[1]);
+               CL_NetworkTimeReceived(realtime); // qw has no clock
 
                // slightly kill qw player entities each frame
                for (i = 1;i < cl.maxclients;i++)
@@ -2216,7 +3011,9 @@ void CL_ParseServerMessage(void)
                cl.qw_num_nails = 0;
 
                // fade weapon view kick
-               cl.qw_weaponkick = min(cl.qw_weaponkick + 10 * (cl.time - cl.oldtime), 0);
+               cl.qw_weaponkick = min(cl.qw_weaponkick + 10 * bound(0, cl.time - cl.oldtime, 0.1), 0);
+
+               cls.servermovesequence = cls.netcon->qw.incoming_sequence;
 
                while (1)
                {
@@ -2311,7 +3108,6 @@ void CL_ParseServerMessage(void)
                        case qw_svc_serverdata:
                                //Cbuf_Execute(); // make sure any stuffed commands are done
                                CL_ParseServerInfo();
-                               CL_VM_Init();   //[515]: init csqc
                                break;
 
                        case qw_svc_setangle:
@@ -2428,16 +3224,18 @@ void CL_ParseServerMessage(void)
                                break;
 
                        case qw_svc_intermission:
+                               if(!cl.intermission)
+                                       cl.completed_time = cl.time;
                                cl.intermission = 1;
-                               cl.completed_time = cl.time;
                                MSG_ReadVector(cl.qw_intermission_origin, cls.protocol);
                                for (i = 0;i < 3;i++)
                                        cl.qw_intermission_angles[i] = MSG_ReadAngle(cls.protocol);
                                break;
 
                        case qw_svc_finale:
+                               if(!cl.intermission)
+                                       cl.completed_time = cl.time;
                                cl.intermission = 2;
-                               cl.completed_time = cl.time;
                                SCR_CenterPrint(MSG_ReadString ());
                                break;
 
@@ -2516,11 +3314,13 @@ void CL_ParseServerMessage(void)
                                break;
 
                        case qw_svc_maxspeed:
-                               cl.qw_movevars_maxspeed = MSG_ReadFloat();
+                               cl.movevars_maxspeed = MSG_ReadFloat();
                                break;
 
                        case qw_svc_entgravity:
-                               cl.qw_movevars_entgravity = MSG_ReadFloat();
+                               cl.movevars_entgravity = MSG_ReadFloat();
+                               if (!cl.movevars_entgravity)
+                                       cl.movevars_entgravity = 1.0f;
                                break;
 
                        case qw_svc_setpause:
@@ -2534,10 +3334,24 @@ void CL_ParseServerMessage(void)
                        }
                }
 
-               // fully kill the still slightly dead qw player entities each frame
-               for (i = 1;i < cl.maxclients;i++)
-                       if (!cl.entities_active[i])
-                               cl.entities[i].state_current.active = false;
+               // fully kill the still slightly dead qw player entities each frame,
+               // but only if a player update was received
+               for (i = 1;i <= cl.maxclients;i++)
+                       if (cl.entities_active[i])
+                               break;
+               if (i <= cl.maxclients)
+               {
+                       // kill all non-updated entities this frame
+                       for (i = 1;i <= cl.maxclients;i++)
+                               if (!cl.entities_active[i])
+                                       cl.entities[i].state_current.active = false;
+               }
+               else
+               {
+                       // no update this frame, restore the cl.entities_active for good measure
+                       for (i = 1;i <= cl.maxclients;i++)
+                               cl.entities_active[i] = cl.entities[i].state_current.active;
+               }
        }
        else
        {
@@ -2617,16 +3431,7 @@ void CL_ParseServerMessage(void)
                                break;
 
                        case svc_time:
-                               cl.mtime[1] = cl.mtime[0];
-                               cl.mtime[0] = MSG_ReadFloat ();
-                               cl.movement_needupdate = true;
-                               // if true the cl.viewangles are interpolated from cl.mviewangles[]
-                               // during this frame
-                               // (makes spectating players much smoother and prevents mouse movement from turning)
-                               cl.fixangle[1] = cl.fixangle[0];
-                               cl.fixangle[0] = false;
-                               if (!cls.demoplayback)
-                                       VectorCopy(cl.mviewangles[0], cl.mviewangles[1]);
+                               CL_NetworkTimeReceived(MSG_ReadFloat());
                                break;
 
                        case svc_clientdata:
@@ -2672,7 +3477,6 @@ void CL_ParseServerMessage(void)
 
                        case svc_serverinfo:
                                CL_ParseServerInfo ();
-                               CL_VM_Init();   //[515]: init csqc
                                break;
 
                        case svc_setangle:
@@ -2695,7 +3499,10 @@ void CL_ParseServerMessage(void)
                                if (cl.viewentity >= cl.max_entities)
                                        CL_ExpandEntities(cl.viewentity);
                                // LordHavoc: assume first setview recieved is the real player entity
-                               if (!cl.playerentity)
+                               if (!cl.realplayerentity)
+                                       cl.realplayerentity = cl.viewentity;
+                               // update cl.playerentity to this one if it is a valid player
+                               if (cl.viewentity >= 1 && cl.viewentity <= cl.maxclients)
                                        cl.playerentity = cl.viewentity;
                                break;
 
@@ -2731,7 +3538,7 @@ void CL_ParseServerMessage(void)
                                                {
                                                        model_t *model = Mod_ForName(s, false, false, i == 1);
                                                        if (!model)
-                                                               Con_Printf("svc_precache: Mod_ForName(\"%s\") failed\n", s);
+                                                               Con_DPrintf("svc_precache: Mod_ForName(\"%s\") failed\n", s);
                                                        cl.model_precache[i] = model;
                                                }
                                                else
@@ -2744,7 +3551,7 @@ void CL_ParseServerMessage(void)
                                                {
                                                        sfx_t *sfx = S_PrecacheSound (s, true, false);
                                                        if (!sfx && snd_initialized.integer)
-                                                               Con_Printf("svc_precache: S_PrecacheSound(\"%s\") failed\n", s);
+                                                               Con_DPrintf("svc_precache: S_PrecacheSound(\"%s\") failed\n", s);
                                                        cl.sound_precache[i] = sfx;
                                                }
                                                else
@@ -2877,19 +3684,22 @@ void CL_ParseServerMessage(void)
                                break;
 
                        case svc_intermission:
+                               if(!cl.intermission)
+                                       cl.completed_time = cl.time;
                                cl.intermission = 1;
-                               cl.completed_time = cl.time;
                                break;
 
                        case svc_finale:
+                               if(!cl.intermission)
+                                       cl.completed_time = cl.time;
                                cl.intermission = 2;
-                               cl.completed_time = cl.time;
                                SCR_CenterPrint(MSG_ReadString ());
                                break;
 
                        case svc_cutscene:
+                               if(!cl.intermission)
+                                       cl.completed_time = cl.time;
                                cl.intermission = 3;
-                               cl.completed_time = cl.time;
                                SCR_CenterPrint(MSG_ReadString ());
                                break;
 
@@ -2947,15 +3757,35 @@ void CL_ParseServerMessage(void)
                        case svc_csqcentities:
                                CSQC_ReadEntities();
                                break;
+                       case svc_downloaddata:
+                               CL_ParseDownload();
+                               break;
+                       case svc_trailparticles:
+                               CL_ParseTrailParticles();
+                               break;
+                       case svc_pointparticles:
+                               CL_ParsePointParticles();
+                               break;
+                       case svc_pointparticles1:
+                               CL_ParsePointParticles1();
+                               break;
                        }
                }
        }
 
-       CL_UpdateItemsAndWeapon();
+       if (cls.signon == SIGNONS)
+               CL_UpdateItemsAndWeapon();
 
        EntityFrameQuake_ISeeDeadEntities();
 
+       CL_UpdateMoveVars();
+
        parsingerror = false;
+
+       // LordHavoc: this was at the start of the function before cl_autodemo was
+       // implemented
+       if (cls.demorecording)
+               CL_WriteDemoMessage (&net_message);
 }
 
 void CL_Parse_DumpPacket(void)
@@ -2969,12 +3799,7 @@ void CL_Parse_DumpPacket(void)
 
 void CL_Parse_ErrorCleanUp(void)
 {
-       if (cls.qw_downloadmemory)
-       {
-               Mem_Free(cls.qw_downloadmemory);
-               cls.qw_downloadmemory = NULL;
-       }
-       cls.qw_downloadpercent = 0;
+       CL_StopDownload(0, 0);
        QW_CL_StopUpload();
 }
 
@@ -2992,12 +3817,28 @@ void CL_Parse_Init(void)
        Cvar_RegisterVariable(&cl_sound_ric1);
        Cvar_RegisterVariable(&cl_sound_ric2);
        Cvar_RegisterVariable(&cl_sound_ric3);
+       Cvar_RegisterVariable(&cl_sound_ric_gunshot);
        Cvar_RegisterVariable(&cl_sound_r_exp3);
 
+       Cvar_RegisterVariable(&cl_joinbeforedownloadsfinish);
+
+       // server extension cvars set by commands issued from the server during connect
+       Cvar_RegisterVariable(&cl_serverextension_download);
+
+       Cvar_RegisterVariable(&cl_nettimesyncfactor);
+       Cvar_RegisterVariable(&cl_nettimesyncboundmode);
+       Cvar_RegisterVariable(&cl_nettimesyncboundtolerance);
+       Cvar_RegisterVariable(&cl_iplog_name);
+
        Cmd_AddCommand("nextul", QW_CL_NextUpload, "sends next fragment of current upload buffer (screenshot for example)");
        Cmd_AddCommand("stopul", QW_CL_StopUpload, "aborts current upload (screenshot for example)");
        Cmd_AddCommand("skins", QW_CL_Skins_f, "downloads missing qw skins from server");
        Cmd_AddCommand("changing", QW_CL_Changing_f, "sent by qw servers to tell client to wait for level change");
+       Cmd_AddCommand("cl_begindownloads", CL_BeginDownloads_f, "used internally by darkplaces client while connecting (causes loading of models and sounds or triggers downloads for missing ones)");
+       Cmd_AddCommand("cl_downloadbegin", CL_DownloadBegin_f, "(networking) informs client of download file information, client replies with sv_startsoundload to begin the transfer");
+       Cmd_AddCommand("stopdownload", CL_StopDownload_f, "terminates a download");
+       Cmd_AddCommand("cl_downloadfinished", CL_DownloadFinished_f, "signals that a download has finished and provides the client with file size and crc to check its integrity");
+       Cmd_AddCommand("iplog_list", CL_IPLog_List_f, "lists names of players whose IP address begins with the supplied text (example: iplog_list 123.456.789)");
 }
 
 void CL_Parse_Shutdown(void)