rewrote memory system entirely (hunk, cache, and zone are gone, memory pools replaced...
[xonotic/darkplaces.git] / cl_parse.c
index c086496..9a06ee4 100644 (file)
@@ -8,7 +8,7 @@ of the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 See the GNU General Public License for more details.
 
@@ -35,7 +35,7 @@ char *svc_strings[128] =
        "svc_stufftext",                // [string] stuffed into client's console buffer
                                                // the string should be \n terminated
        "svc_setangle",         // [vec3] set the view angle to this absolute value
-       
+
        "svc_serverinfo",               // [long] version
                                                // [string] signon string
                                                // [string]..[0]model cache [string]...[0]sounds cache
@@ -65,28 +65,39 @@ char *svc_strings[128] =
        "svc_cdtrack",                  // [byte] track [byte] looptrack
        "svc_sellscreen",
        "svc_cutscene",
-       "svc_showlmp",  // [string] iconlabel [string] lmpfile [byte] x [byte] y
+       "svc_showlmp",  // [string] iconlabel [string] lmpfile [short] x [short] y
        "svc_hidelmp",  // [string] iconlabel
        "svc_skybox", // [string] skyname
-       "?", // 38
-       "?", // 39
-       "?", // 40
-       "?", // 41
-       "?", // 42
-       "?", // 43
-       "?", // 44
-       "?", // 45
-       "?", // 46
-       "?", // 47
-       "?", // 48
-       "?", // 49
-       "svc_farclip", // [coord] size
-       "svc_fog", // [byte] enable <optional past this point, only included if enable is true> [short] density*4096 [byte] red [byte] green [byte] blue
-       "svc_playerposition" // [float] x [float] y [float] z
+       "", // 38
+       "", // 39
+       "", // 40
+       "", // 41
+       "", // 42
+       "", // 43
+       "", // 44
+       "", // 45
+       "", // 46
+       "", // 47
+       "", // 48
+       "", // 49
+       "", // 50
+       "svc_fog", // 51
+       "svc_effect", // [vector] org [byte] modelindex [byte] startframe [byte] framecount [byte] framerate
+       "svc_effect2", // [vector] org [short] modelindex [short] startframe [byte] framecount [byte] framerate
 };
 
 //=============================================================================
 
+cvar_t demo_nehahra = {0, "demo_nehahra", "0"};
+
+void CL_Parse_Init(void)
+{
+       // LordHavoc: added demo_nehahra cvar
+       Cvar_RegisterVariable (&demo_nehahra);
+       if (gamemode == GAME_NEHAHRA)
+               Cvar_SetValue("demo_nehahra", 1);
+}
+
 qboolean Nehahrademcompatibility; // LordHavoc: to allow playback of the early Nehahra movie segments
 qboolean dpprotocol; // LordHavoc: whether or not the current network stream is the enhanced DarkPlaces protocol
 
@@ -99,16 +110,21 @@ This error checks and tracks the total number of entities
 */
 entity_t       *CL_EntityNum (int num)
 {
+       /*
        if (num >= cl.num_entities)
        {
                if (num >= MAX_EDICTS)
                        Host_Error ("CL_EntityNum: %i is an invalid number",num);
-               while (cl.num_entities<=num)
-               {
-                       cl_entities[cl.num_entities].colormap = -1; // no special coloring
-                       cl.num_entities++;
-               }
+               cl.num_entities = num;
+//             while (cl.num_entities <= num)
+//             {
+//                     cl_entities[cl.num_entities].colormap = -1; // no special coloring
+//                     cl.num_entities++;
+//             }
        }
+       */
+       if (num >= MAX_EDICTS)
+               Host_Error ("CL_EntityNum: %i is an invalid number",num);
                
        return &cl_entities[num];
 }
@@ -119,14 +135,14 @@ entity_t  *CL_EntityNum (int num)
 CL_ParseStartSoundPacket
 ==================
 */
-void CL_ParseStartSoundPacket(void)
+void CL_ParseStartSoundPacket(int largesoundindex)
 {
     vec3_t  pos;
     int        channel, ent;
     int        sound_num;
     int        volume;
     int        field_mask;
-    float      attenuation;  
+    float      attenuation;
        int             i;
                   
     field_mask = MSG_ReadByte(); 
@@ -142,7 +158,13 @@ void CL_ParseStartSoundPacket(void)
                attenuation = DEFAULT_SOUND_PACKET_ATTENUATION;
        
        channel = MSG_ReadShort ();
-       sound_num = MSG_ReadByte ();
+       if (largesoundindex)
+               sound_num = (unsigned short) MSG_ReadShort ();
+       else
+               sound_num = MSG_ReadByte ();
+
+       if (sound_num >= MAX_SOUNDS)
+               Host_Error("CL_ParseStartSoundPacket: sound_num (%i) >= MAX_SOUNDS (%i)\n", sound_num, MAX_SOUNDS);
 
        ent = channel >> 3;
        channel &= 7;
@@ -152,7 +174,7 @@ void CL_ParseStartSoundPacket(void)
        
        for (i=0 ; i<3 ; i++)
                pos[i] = MSG_ReadCoord ();
+
     S_StartSound (ent, channel, cl.sound_precache[sound_num], pos, volume/255.0, attenuation);
 }       
 
@@ -204,7 +226,7 @@ void CL_KeepaliveMessage (void)
        memcpy (net_message.data, olddata, net_message.cursize);
 
 // check time
-       time = Sys_FloatTime ();
+       time = Sys_DoubleTime ();
        if (time - lastmsg < 5)
                return;
        lastmsg = time;
@@ -217,37 +239,88 @@ void CL_KeepaliveMessage (void)
        SZ_Clear (&cls.message);
 }
 
-extern qboolean isworldmodel;
-extern char skyname[];
-extern void R_SetSkyBox (char *sky);
-extern void FOG_clear();
-extern cvar_t r_farclip;
+//FIXME finish this code!
+#define MAX_STATICLIGHTS 2048
+// tyrlite types
+#define LIGHTFADE_LMINUSX 0 // light, arghlite, others?
+#define LIGHTFADE_LDIVX 1
+#define LIGHTFADE_LDIVX2 2 // hlight
+#define LIGHTFADE_L 3
+#define LIGHTFADE_DEFAULT 999999 // light util not yet identified, switched later
+
+typedef struct
+{
+       int fadetype; // one of the LIGHTFADE_ values
+       int style;
+       vec3_t origin;
+       vec_t radius; // the point at which lighting stops
+       vec3_t direction;
+       vec_t cone; // if non-zero, it is a spot light
+       vec3_t color;
+       vec_t distancescale; // attenuation
+       vec_t lightsubtract; // biasing lighting toward black (hlight feature)
+}
+staticlight_t;
+
+staticlight_t staticlight[MAX_STATICLIGHTS];
+int staticlights;
+
+int r_sunlightenabled;
+vec3_t r_sunlightdirection, r_sunlightcolor;
+vec3_t r_light_ambientcolor;
 
 void CL_ParseEntityLump(char *entdata)
 {
        char *data;
-       char key[128], value[1024];
-       char wadname[128];
-       int i, j, k;
+       char key[128], value[4096];
+       char targetnamebuffer[65536];
+       char *targetname[8192], *target[MAX_STATICLIGHTS], light_target[256];
+       vec3_t targetnameorigin[8192], targetnametemporigin, v;
+       int targets, targetnames, targetnamebufferpos, targetnameorigintofillin;
+       int i, j, n;
+       float f1, f2, f3, f4;
+       float ambientlight, ambientcolor[3], sunlight, sunlightdirection[3], sunlightcolor[3];
+       int light_fadetype, light_style, hlight, tyrlite, light_enable;
+       float light_origin[3], light_light, light_distancescale, light_lightcolor[3], light_color[3], light_direction[3], light_cone, light_lightradius;
        FOG_clear(); // LordHavoc: no fog until set
-       skyname[0] = 0; // LordHavoc: no enviroment mapped sky until set
-       r_farclip.value = 6144; // LordHavoc: default farclip distance
+       R_SetSkyBox(""); // LordHavoc: no environment mapped sky until set
+       r_sunlightenabled = false;
+       staticlights = 0;
        data = entdata;
        if (!data)
                return;
        data = COM_Parse(data);
        if (!data)
-               return; // valid exit
+               return; // error
        if (com_token[0] != '{')
                return; // error
+       hlight = false;
+       tyrlite = false;
+       ambientlight = 0;
+       ambientcolor[0] = ambientcolor[1] = ambientcolor[2] = 1;
+       sunlight = 0;
+       sunlightcolor[0] = sunlightcolor[1] = sunlightcolor[2] = 1;
+       sunlightdirection[0] = 0;
+       sunlightdirection[1] = 0;
+       sunlightdirection[2] = -1;
+       targets = 0;
+       targetnames = 0;
+       targetnamebufferpos = 0;
+       targetnameorigintofillin = -1;
+       targetnametemporigin[0] = 0;
+       targetnametemporigin[1] = 0;
+       targetnametemporigin[2] = 0;
        while (1)
        {
                data = COM_Parse(data);
                if (!data)
                        return; // error
                if (com_token[0] == '}')
-                       return; // since we're just parsing the first ent (worldspawn), exit
-               strcpy(key, com_token);
+                       break; // end of worldspawn
+               if (com_token[0] == '_')
+                       strcpy(key, com_token + 1);
+               else
+                       strcpy(key, com_token);
                while (key[strlen(key)-1] == ' ') // remove trailing spaces
                        key[strlen(key)-1] = 0;
                data = COM_Parse(data);
@@ -260,17 +333,8 @@ void CL_ParseEntityLump(char *entdata)
                        R_SetSkyBox(value);
                else if (!strcmp("qlsky", key)) // non-standard, introduced by QuakeLives (EEK)
                        R_SetSkyBox(value);
-               else if (!strcmp("farclip", key))
-               {
-                       r_farclip.value = atof(value);
-                       if (r_farclip.value < 64)
-                               r_farclip.value = 64;
-               }
                else if (!strcmp("fog", key))
-               {
                        scanf(value, "%f %f %f %f", &fog_density, &fog_red, &fog_green, &fog_blue);
-                       j = 0;
-               }
                else if (!strcmp("fog_density", key))
                        fog_density = atof(value);
                else if (!strcmp("fog_red", key))
@@ -279,33 +343,292 @@ void CL_ParseEntityLump(char *entdata)
                        fog_green = atof(value);
                else if (!strcmp("fog_blue", key))
                        fog_blue = atof(value);
-               else if (!strcmp("wad", key)) // for HalfLife maps
+               else if (!strcmp("light", key))
+                       ambientlight = atof(value);
+               else if (!strcmp("sunlight", key))
                {
-                       j = 0;
-                       for (i = 0;i < 128;i++)
-                               if (value[i] != ';' && value[i] != '\\' && value[i] != '/' && value[i] != ':')
+                       sunlight = atof(value);
+                       tyrlite = true;
+               }
+               else if (!strcmp("sun_color", key))
+               {
+                       if (scanf(value, "%f %f %f", &v[0], &v[1], &v[2]) == 3)
+                               VectorCopy(v, sunlightcolor);
+                       tyrlite = true;
+               }
+               else if (!strcmp("sun_mangle", key))
+               {
+                       if (scanf(value, "%f %f %f", &v[0], &v[1], &v[2]) == 3)
+                               AngleVectors(v, sunlightdirection, NULL, NULL);
+                       tyrlite = true;
+               }
+               else if (!strcmp("origin", key))
+               {
+                       if (scanf(value, "%f %f %f", &v[0], &v[1], &v[2]) == 3)
+                       {
+                               VectorCopy(v, targetnametemporigin);
+                               VectorCopy(v, light_origin);
+                       }
+               }
+               else if (!strcmp("targetname", key))
+               {
+                       if ((targetnames < 8192) && (strlen(value) + 1 + targetnamebufferpos <= 65536))
+                       {
+                               targetname[targetnames] = targetnamebuffer + targetnamebufferpos;
+                               strcpy(targetnamebuffer + targetnamebufferpos, value);
+                               targetnamebufferpos += strlen(value) + 1;
+                               targetnameorigintofillin = targetnames++;
+                       }
+               }
+       }
+       if (targetnameorigintofillin >= 0)
+               VectorCopy(targetnametemporigin, targetnameorigin[targetnameorigintofillin]);
+
+       if (sunlight)
+       {
+               r_sunlightenabled = true;
+               VectorScale(sunlightcolor, sunlight, r_sunlightcolor);
+               VectorCopy(sunlightdirection, r_sunlightdirection);
+       }
+       VectorScale(ambientcolor, ambientlight, r_light_ambientcolor);
+
+       while(1)
+       {
+               data = COM_Parse(data);
+               if (!data)
+                       break; // done
+               if (com_token[0] != '{')
+                       break; // error
+               light_light = 0;
+               light_lightcolor[0] = light_lightcolor[1] = light_lightcolor[2] = 1.0f;
+               light_color[0] = light_color[1] = light_color[2] = 1.0f;
+               light_direction[0] = light_direction[1] = light_direction[2] = 0.0f;
+               light_cone = -cos(20*M_PI/180);
+               light_distancescale = 1.0f;
+               light_fadetype = LIGHTFADE_DEFAULT; // replaced later when light util is identified
+               light_style = 0;
+               light_lightradius = 0;
+               light_enable = false;
+               targetnameorigintofillin = -1;
+               targetnametemporigin[0] = 0;
+               targetnametemporigin[1] = 0;
+               targetnametemporigin[2] = 0;
+               while (1)
+               {
+                       data = COM_Parse(data);
+                       if (!data)
+                               return; // error
+                       if (com_token[0] == '}')
+                               break;
+                       if (com_token[0] == '_')
+                               strcpy(key, com_token + 1);
+                       else
+                               strcpy(key, com_token);
+                       while (key[strlen(key)-1] == ' ') // remove trailing spaces
+                               key[strlen(key)-1] = 0;
+                       data = COM_Parse(data);
+                       if (!data)
+                               return; // error
+                       strcpy(value, com_token);
+                       if (!strcmp("light", key))
+                       {
+                               n = scanf(value, "%f %f %f %f", &f1, &f2, &f3, &f4);
+                               switch(n)
+                               {
+                               case 1:
+                                       // id light, arghlite, tyrlite, others
+                                       light_light = f1;
+                                       light_lightcolor[0] = light_lightcolor[1] = light_lightcolor[2] = 1.0f;
+                                       break;
+                               case 3:
+                                       // hlight specific (supports all 3 light formats, but this one is unique to it)
+                                       hlight = true;
+                                       light_light = max(f1, max(f2, f3));
+                                       light_lightcolor[0] = f1 / light_light;
+                                       light_lightcolor[1] = f2 / light_light;
+                                       light_lightcolor[2] = f3 / light_light;
+                                       break;
+                               case 4:
+                                       // halflife
+                                       hlight = true; // unless this is a halflife map, probably hlight
+                                       light_light = f4;
+                                       light_lightcolor[0] = f1 * (1.0f / 255.0f);
+                                       light_lightcolor[1] = f1 * (1.0f / 255.0f);
+                                       light_lightcolor[2] = f1 * (1.0f / 255.0f);
                                        break;
-                       if (value[i])
+                               default:
+                                       // error
+                                       break;
+                               }
+                       }
+                       else if (!strcmp("color", key))
                        {
-                               for (;i < 128;i++)
+                               n = scanf(value, "%f %f %f", &f1, &f2, &f3);
+                               if (n == 3)
                                {
-                                       // ignore path - the \\ check is for HalfLife... stupid windoze 'programmers'...
-                                       if (value[i] == '\\' || value[i] == '/' || value[i] == ':')
-                                               j = i+1;
-                                       else if (value[i] == ';' || value[i] == 0)
-                                       {
-                                               k = value[i];
-                                               value[i] = 0;
-                                               strcpy(wadname, "textures/");
-                                               strcat(wadname, &value[j]);
-                                               W_LoadTextureWadFile (wadname, FALSE);
-                                               j = i+1;
-                                               if (!k)
-                                                       break;
-                                       }
+                                       light_color[0] = f1;
+                                       light_color[1] = f2;
+                                       light_color[2] = f3;
                                }
+                               // n != 3 is an error
                        }
+                       else if (!strcmp("wait", key))
+                               light_distancescale = atof(value);
+                       else if (!strcmp("delay", key))
+                       {
+                               light_fadetype = atoi(value);
+                               tyrlite = true;
+                       }
+                       else if (!strcmp("angle", key))
+                               light_cone = -cos(atof(value) * M_PI / 360);
+                       else if (!strcmp("mangle", key))
+                       {
+                               n = scanf(value, "%f %f %f", &v[0], &v[1], &v[2]);
+                               if (n == 3)
+                                       AngleVectors(v, light_direction, NULL, NULL);
+                               // n != 3 is an error
+                               tyrlite = true;
+                       }
+                       else if (!strcmp("style", key))
+                       {
+                               n = atoi(value);
+                               if (n >= 0 && n < MAX_LIGHTSTYLES)
+                                       light_style = n;
+                       }
+                       else if (!strcmp("lightradius", key))
+                       {
+                               hlight = true;
+                               light_lightradius = atof(value);
+                       }
+                       else if (!strcmp("classname", key))
+                               if (!strncmp(value, "light", 5))
+                                       light_enable = true;
+                       else if (!strcmp("origin", key))
+                       {
+                               if (scanf(value, "%f %f %f", &v[0], &v[1], &v[2]) == 3)
+                                       VectorCopy(v, targetnametemporigin);
+                       }
+                       else if (!strcmp("targetname", key))
+                       {
+                               if ((targetnames < 8192) && (strlen(value) + 1 + targetnamebufferpos <= 65536))
+                               {
+                                       targetname[targetnames] = targetnamebuffer + targetnamebufferpos;
+                                       strcpy(targetnamebuffer + targetnamebufferpos, value);
+                                       targetnamebufferpos += strlen(value) + 1;
+                                       targetnameorigintofillin = targetnames++;
+                               }
+                       }
+                       else if (!strcmp("target", key))
+                               if (strlen(value) < sizeof(light_target))
+                                       strcpy(light_target, value);
+               }
+               if (targetnameorigintofillin >= 0)
+                       VectorCopy(targetnametemporigin, targetnameorigin[targetnameorigintofillin]);
+               if (light_enable && staticlights < MAX_STATICLIGHTS && light_light != 0)
+               {
+                       VectorCopy(light_origin, staticlight[staticlights].origin);
+                       staticlight[staticlights].color[0] = light_light * light_lightcolor[0] * light_color[0];
+                       staticlight[staticlights].color[1] = light_light * light_lightcolor[1] * light_color[1];
+                       staticlight[staticlights].color[2] = light_light * light_lightcolor[2] * light_color[2];
+                       VectorCopy(light_direction, staticlight[staticlights].direction);
+                       staticlight[staticlights].cone = light_cone;
+                       staticlight[staticlights].distancescale = light_distancescale;
+                       staticlight[staticlights].fadetype = light_fadetype;
+                       staticlight[staticlights].style = light_style;
+                       if (light_target && (targets < 8192) && (strlen(value) + 1 + targetnamebufferpos <= 65536))
+                       {
+                               target[staticlights] = targetnamebuffer + targetnamebufferpos;
+                               strcpy(targetnamebuffer + targetnamebufferpos, value);
+                               targetnamebufferpos += strlen(value) + 1;
+                       }
+                       else
+                               target[staticlights] = NULL;
+                       staticlight[staticlights].lightsubtract = 0;
+                       if (light_lightradius)
+                       {
+                               staticlight[staticlights].fadetype = LIGHTFADE_LDIVX2;
+                               staticlight[staticlights].lightsubtract = max(staticlight[staticlights].color[0], max(staticlight[staticlights].color[1], staticlight[staticlights].color[2])) * 0.5f / (light_lightradius * light_distancescale * light_lightradius * light_distancescale * (1.0f / 65536.0f) + 1.0f);
+                       }
+                       staticlights++;
+               }
+       }
+       if (cl.worldmodel->ishlbsp)
+               n = LIGHTFADE_LDIVX2;
+       else if (tyrlite)
+               n = LIGHTFADE_LMINUSX;
+       else if (hlight)
+               n = LIGHTFADE_LDIVX2;
+       else
+               n = LIGHTFADE_LMINUSX;
+       for (i = 0;i < staticlights;i++)
+       {
+               if (staticlight[i].fadetype == LIGHTFADE_DEFAULT)
+                       staticlight[i].fadetype = n;
+               if (target[i])
+               {
+                       for (j = 0;j < targetnames;j++)
+                       {
+                               if (!strcmp(target[i], targetname[j]))
+                               {
+                                       VectorSubtract(targetnameorigin[j], staticlight[i].origin, v);
+                                       VectorNormalize(v);
+                                       VectorCopy(v, staticlight[i].direction);
+                                       break;
+                               }
+                       }
+               }
+               if (staticlight[i].direction[0] == 0 && staticlight[i].direction[1] == 0 && staticlight[i].direction[2] == 0)
+                       staticlight[i].cone = 0;
+       }
+}
+
+/*
+=====================
+CL_SignonReply
+
+An svc_signonnum has been received, perform a client side setup
+=====================
+*/
+static void CL_SignonReply (void)
+{
+       char    str[8192];
+
+Con_DPrintf ("CL_SignonReply: %i\n", cls.signon);
+
+       switch (cls.signon)
+       {
+       case 1:
+               MSG_WriteByte (&cls.message, clc_stringcmd);
+               MSG_WriteString (&cls.message, "prespawn");
+               break;
+
+       case 2:
+               MSG_WriteByte (&cls.message, clc_stringcmd);
+               MSG_WriteString (&cls.message, va("name \"%s\"\n", cl_name.string));
+
+               MSG_WriteByte (&cls.message, clc_stringcmd);
+               MSG_WriteString (&cls.message, va("color %i %i\n", cl_color.integer >> 4, cl_color.integer & 15));
+
+               if (cl_pmodel.integer)
+               {
+                       MSG_WriteByte (&cls.message, clc_stringcmd);
+                       MSG_WriteString (&cls.message, va("pmodel %i\n", cl_pmodel.integer));
                }
+
+               MSG_WriteByte (&cls.message, clc_stringcmd);
+               sprintf (str, "spawn %s", cls.spawnparms);
+               MSG_WriteString (&cls.message, str);
+               break;
+
+       case 3:
+               MSG_WriteByte (&cls.message, clc_stringcmd);
+               MSG_WriteString (&cls.message, "begin");
+               break;
+
+       case 4:
+//             SCR_EndLoadingPlaque ();                // allow normal screen updates
+               Con_ClearNotify();
+               break;
        }
 }
 
@@ -314,7 +637,6 @@ void CL_ParseEntityLump(char *entdata)
 CL_ParseServerInfo
 ==================
 */
-extern cvar_t demo_nehahra;
 void CL_ParseServerInfo (void)
 {
        char    *str;
@@ -322,7 +644,7 @@ void CL_ParseServerInfo (void)
        int             nummodels, numsounds;
        char    model_precache[MAX_MODELS][MAX_QPATH];
        char    sound_precache[MAX_SOUNDS][MAX_QPATH];
-       
+
        Con_DPrintf ("Serverinfo packet received.\n");
 //
 // wipe the client_state_t struct
@@ -339,7 +661,7 @@ void CL_ParseServerInfo (void)
        Nehahrademcompatibility = false;
        if (i == 250)
                Nehahrademcompatibility = true;
-       if (cls.demoplayback && demo_nehahra.value)
+       if (cls.demoplayback && demo_nehahra.integer)
                Nehahrademcompatibility = true;
        dpprotocol = i == DPPROTOCOL_VERSION;
 
@@ -350,7 +672,7 @@ void CL_ParseServerInfo (void)
                Con_Printf("Bad maxclients (%u) from server\n", cl.maxclients);
                return;
        }
-       cl.scores = Hunk_AllocName (cl.maxclients*sizeof(*cl.scores), "scores");
+       cl.scores = Mem_Alloc(cl_scores_mempool, cl.maxclients*sizeof(*cl.scores));
 
 // parse gametype
        cl.gametype = MSG_ReadByte ();
@@ -372,6 +694,12 @@ void CL_ParseServerInfo (void)
 // needlessly purge it
 //
 
+       Mem_CheckSentinelsGlobal();
+
+       Mod_ClearUsed();
+
+       Mem_CheckSentinelsGlobal();
+
 // precache models
        memset (cl.model_precache, 0, sizeof(cl.model_precache));
        for (nummodels=1 ; ; nummodels++)
@@ -408,14 +736,21 @@ void CL_ParseServerInfo (void)
                S_TouchSound (str);
        }
 
+       Mem_CheckSentinelsGlobal();
+
+       Mod_PurgeUnused();
+
 //
 // now we try to load everything else until a cache allocation fails
 //
 
+       Mem_CheckSentinelsGlobal();
+
        for (i=1 ; i<nummodels ; i++)
        {
-               isworldmodel = i == 1; // LordHavoc: first model is the world model
-               cl.model_precache[i] = Mod_ForName (model_precache[i], false);
+               // LordHavoc: i == 1 means the first model is the world model
+               cl.model_precache[i] = Mod_ForName (model_precache[i], false, true, i == 1);
+
                if (cl.model_precache[i] == NULL)
                {
                        Con_Printf("Model %s not found\n", model_precache[i]);
@@ -424,6 +759,8 @@ void CL_ParseServerInfo (void)
                CL_KeepaliveMessage ();
        }
 
+       Mem_CheckSentinelsGlobal();
+
        S_BeginPrecaching ();
        for (i=1 ; i<numsounds ; i++)
        {
@@ -432,17 +769,45 @@ void CL_ParseServerInfo (void)
        }
        S_EndPrecaching ();
 
-
 // local state
-       cl_entities[0].model = cl.worldmodel = cl.model_precache[1];
-       
+       cl_entities[0].render.model = cl.worldmodel = cl.model_precache[1];
+       cl_entities[0].render.scale = 1;
+       cl_entities[0].render.alpha = 1;
+
        R_NewMap ();
 
-       Hunk_Check ();          // make sure nothing is hurt
-       
-       noclip_anglehack = false;               // noclip is turned off at start        
+       Mem_CheckSentinelsGlobal();
+
+       noclip_anglehack = false;               // noclip is turned off at start
 }
 
+void CL_ValidateState(entity_state_t *s)
+{
+       model_t *model;
+
+       if (!s->active)
+               return;
+
+       if (s->modelindex >= MAX_MODELS)
+               Host_Error("CL_ValidateState: modelindex (%i) >= MAX_MODELS (%i)\n", s->modelindex, MAX_MODELS);
+
+       // colormap is client index + 1
+       if (s->colormap > cl.maxclients)
+               Host_Error ("CL_ValidateState: colormap (%i) > cl.maxclients (%i)", s->colormap, cl.maxclients);
+
+       model = cl.model_precache[s->modelindex];
+       Mod_CheckLoaded(model);
+       if (model && s->frame >= model->numframes)
+       {
+               Con_Printf("CL_ValidateState: no such frame %i in \"%s\"\n", s->frame, model->name);
+               s->frame = 0;
+       }
+       if (model && s->skin > 0 && s->skin >= model->numskins)
+       {
+               Con_Printf("CL_ValidateState: no such skin %i in \"%s\"\n", s->skin, model->name);
+               s->skin = 0;
+       }
+}
 
 /*
 ==================
@@ -453,13 +818,13 @@ If an entities model or origin changes from frame to frame, it must be
 relinked.  Other attributes can change without relinking.
 ==================
 */
+byte entkill[MAX_EDICTS];
+int bitprofile[32], bitprofilecount = 0;
 void CL_ParseUpdate (int bits)
 {
-       int                     i, modnum, num, alpha, scale, glowsize, glowcolor, colormod;
-       model_t         *model;
-       qboolean        forcelink;
-       entity_t        *ent;
-       entity_state_t *baseline;
+       int i, num, deltadie;
+       entity_t *ent;
+       entity_state_t new;
 
        if (cls.signon == SIGNONS - 1)
        {       // first update is the final signon stage
@@ -469,163 +834,222 @@ void CL_ParseUpdate (int bits)
 
        if (bits & U_MOREBITS)
                bits |= (MSG_ReadByte()<<8);
-       if (bits & U_EXTEND1 && !Nehahrademcompatibility)
+       if ((bits & U_EXTEND1) && (!Nehahrademcompatibility))
        {
                bits |= MSG_ReadByte() << 16;
                if (bits & U_EXTEND2)
                        bits |= MSG_ReadByte() << 24;
        }
 
-       if (bits & U_LONGENTITY)        
-               num = MSG_ReadShort ();
+       if (bits & U_LONGENTITY)
+               num = (unsigned) MSG_ReadShort ();
        else
-               num = MSG_ReadByte ();
+               num = (unsigned) MSG_ReadByte ();
+
+       if (num >= MAX_EDICTS)
+               Host_Error("CL_ParseUpdate: entity number (%i) >= MAX_EDICTS (%i)\n", num, MAX_EDICTS);
+       if (num < 1)
+               Host_Error("CL_ParseUpdate: invalid entity number (%i)\n", num);
+
+       // mark as visible (no kill)
+       entkill[num] = 0;
 
        ent = CL_EntityNum (num);
 
-       forcelink = ent->msgtime != cl.mtime[1]; // no previous frame to lerp from
+       for (i = 0;i < 32;i++)
+               if (bits & (1 << i))
+                       bitprofile[i]++;
+       bitprofilecount++;
 
-       ent->msgtime = cl.mtime[0];
-       
-       // LordHavoc: new protocol stuff
-       baseline = &ent->baseline;
+       deltadie = false;
        if (bits & U_DELTA)
-               baseline = &ent->deltabaseline;
-
-       if (forcelink)
        {
-               ent->deltabaseline.origin[0] = ent->deltabaseline.origin[1] = ent->deltabaseline.origin[2] = 0;
-               ent->deltabaseline.angles[0] = ent->deltabaseline.angles[1] = ent->deltabaseline.angles[2] = 0;
-               ent->deltabaseline.effects = 0;
-               ent->deltabaseline.modelindex = 0;
-               ent->deltabaseline.frame = 0;
-               ent->deltabaseline.colormap = 0;
-               ent->deltabaseline.skin = 0;
-               ent->deltabaseline.alpha = 255;
-               ent->deltabaseline.scale = 16;
-               ent->deltabaseline.glowsize = 0;
-               ent->deltabaseline.glowcolor = 254;
-               ent->deltabaseline.colormod = 255;
+               new = ent->state_current;
+               if (!new.active)
+                       deltadie = true; // was not present in previous frame, leave hidden until next full update
        }
-
-       modnum = bits & U_MODEL ? MSG_ReadByte() : baseline->modelindex;
-       if (modnum >= MAX_MODELS)
-               Host_Error ("CL_ParseModel: bad modnum");
-       ent->deltabaseline.modelindex = modnum;
-               
-       model = cl.model_precache[modnum];
-       if (model != ent->model)
+       else
+               new = ent->state_baseline;
+
+       new.time = cl.mtime[0];
+
+       new.flags = 0;
+       new.active = true;
+       if (bits & U_MODEL)             new.modelindex = (new.modelindex & 0xFF00) | MSG_ReadByte();
+       if (bits & U_FRAME)             new.frame = (new.frame & 0xFF00) | MSG_ReadByte();
+       if (bits & U_COLORMAP)  new.colormap = MSG_ReadByte();
+       if (bits & U_SKIN)              new.skin = MSG_ReadByte();
+       if (bits & U_EFFECTS)   new.effects = (new.effects & 0xFF00) | MSG_ReadByte();
+       if (bits & U_ORIGIN1)   new.origin[0] = MSG_ReadCoord();
+       if (bits & U_ANGLE1)    new.angles[0] = MSG_ReadAngle();
+       if (bits & U_ORIGIN2)   new.origin[1] = MSG_ReadCoord();
+       if (bits & U_ANGLE2)    new.angles[1] = MSG_ReadAngle();
+       if (bits & U_ORIGIN3)   new.origin[2] = MSG_ReadCoord();
+       if (bits & U_ANGLE3)    new.angles[2] = MSG_ReadAngle();
+       if (bits & U_STEP)              new.flags |= RENDER_STEP;
+       if (bits & U_ALPHA)             new.alpha = MSG_ReadByte();
+       if (bits & U_SCALE)             new.scale = MSG_ReadByte();
+       if (bits & U_EFFECTS2)  new.effects = (new.effects & 0x00FF) | (MSG_ReadByte() << 8);
+       if (bits & U_GLOWSIZE)  new.glowsize = MSG_ReadByte();
+       if (bits & U_GLOWCOLOR) new.glowcolor = MSG_ReadByte();
+#if 0
+       if (bits & U_COLORMOD)  {int i = MSG_ReadByte();float r = (((int) i >> 5) & 7) * 1.0 / 7, g = (((int) i >> 2) & 7) * 1.0 / 7, b = ((int) i & 3) * 1.0 / 3;Con_Printf("warning: U_COLORMOD %i (%1.2f %1.2f %1.2f) ignored\n", i, r, g, b);}
+#else
+       // apparently the dpcrush demo uses this (unintended, and it uses white anyway)
+       if (bits & U_COLORMOD)  MSG_ReadByte();
+#endif
+       if (bits & U_GLOWTRAIL) new.flags |= RENDER_GLOWTRAIL;
+       if (bits & U_FRAME2)    new.frame = (new.frame & 0x00FF) | (MSG_ReadByte() << 8);
+       if (bits & U_MODEL2)    new.modelindex = (new.modelindex & 0x00FF) | (MSG_ReadByte() << 8);
+       if (bits & U_VIEWMODEL) new.flags |= RENDER_VIEWMODEL;
+       if (bits & U_EXTERIORMODEL)     new.flags |= RENDER_EXTERIORMODEL;
+
+       // LordHavoc: to allow playback of the Nehahra movie
+       if (Nehahrademcompatibility && (bits & U_EXTEND1))
        {
-               ent->model = model;
-       // automatic animation (torches, etc) can be either all together
-       // or randomized
-               if (model)
-                       ent->syncbase = model->synctype == ST_RAND ? (float)(rand()&0x7fff) / 0x7fff : 0.0;
+               // LordHavoc: evil format
+               int i = MSG_ReadFloat();
+               int j = MSG_ReadFloat() * 255.0f;
+               if (i == 2)
+               {
+                       if (MSG_ReadFloat())
+                               new.effects |= EF_FULLBRIGHT;
+               }
+               if (j < 0)
+                       new.alpha = 0;
+               else if (j == 0 || j >= 255)
+                       new.alpha = 255;
                else
-                       forcelink = true;       // hack to make null model players work
+                       new.alpha = j;
        }
 
-       ent->frame = ((bits & U_FRAME) ? MSG_ReadByte() : (baseline->frame & 0xFF));
-
-       i = bits & U_COLORMAP ? MSG_ReadByte() : baseline->colormap;
-       ent->deltabaseline.colormap = i;
-       if (!i)
-               ent->colormap = -1; // no special coloring
-       else
+       if (deltadie)
        {
-               if (i > cl.maxclients)
-                       Host_Error ("i >= cl.maxclients");
-               ent->colormap = cl.scores[i-1].colors; // color it
+               // hide the entity
+               new.active = false;
        }
+       else
+               CL_ValidateState(&new);
 
-       ent->deltabaseline.skin = ent->skinnum = bits & U_SKIN ? MSG_ReadByte() : baseline->skin;
-
-       ent->effects = ((bits & U_EFFECTS) ? MSG_ReadByte() : (baseline->effects & 0xFF));
-
-// shift the known values for interpolation
-       VectorCopy (ent->msg_origins[0], ent->msg_origins[1]);
-       VectorCopy (ent->msg_angles[0], ent->msg_angles[1]);
-       VectorCopy (baseline->origin, ent->msg_origins[0]);
-       VectorCopy (baseline->angles, ent->msg_angles[0]);
-
-       if (bits & U_ORIGIN1) ent->msg_origins[0][0] = MSG_ReadCoord ();
-       if (bits & U_ANGLE1) ent->msg_angles[0][0] = MSG_ReadAngle();
-       if (bits & U_ORIGIN2) ent->msg_origins[0][1] = MSG_ReadCoord ();
-       if (bits & U_ANGLE2) ent->msg_angles[0][1] = MSG_ReadAngle();
-       if (bits & U_ORIGIN3) ent->msg_origins[0][2] = MSG_ReadCoord ();
-       if (bits & U_ANGLE3) ent->msg_angles[0][2] = MSG_ReadAngle();
-
-       VectorCopy(ent->msg_origins[0], ent->deltabaseline.origin);
-       VectorCopy(ent->msg_angles[0], ent->deltabaseline.angles);
-
-       alpha = bits & U_ALPHA ? MSG_ReadByte() : baseline->alpha;
-       scale = bits & U_SCALE ? MSG_ReadByte() : baseline->scale;
-       ent->effects |= ((bits & U_EFFECTS2) ? (MSG_ReadByte() << 8) : (baseline->effects & 0xFF00));
-       glowsize = bits & U_GLOWSIZE ? MSG_ReadByte() : baseline->glowsize;
-       glowcolor = bits & U_GLOWCOLOR ? MSG_ReadByte() : baseline->glowcolor;
-       colormod = bits & U_COLORMOD ? MSG_ReadByte() : baseline->colormod;
-       ent->frame |= ((bits & U_FRAME2) ? (MSG_ReadByte() << 8) : (baseline->frame & 0xFF00));
-       ent->deltabaseline.alpha = alpha;
-       ent->deltabaseline.scale = scale;
-       ent->deltabaseline.effects = ent->effects;
-       ent->deltabaseline.glowsize = glowsize;
-       ent->deltabaseline.glowcolor = glowcolor;
-       ent->deltabaseline.colormod = colormod;
-       ent->deltabaseline.frame = ent->frame;
-       ent->alpha = (float) alpha * (1.0 / 255.0);
-       ent->scale = (float) scale * (1.0 / 16.0);
-       ent->glowsize = glowsize * 4.0;
-       ent->glowcolor = glowcolor;
-       ent->colormod[0] = (float) ((colormod >> 5) & 7) * (1.0 / 7.0);
-       ent->colormod[1] = (float) ((colormod >> 2) & 7) * (1.0 / 7.0);
-       ent->colormod[2] = (float) (colormod & 3) * (1.0 / 3.0);
-       if (bits & U_EXTEND1 && Nehahrademcompatibility) // LordHavoc: to allow playback of the early Nehahra movie segments
+       if (new.flags & RENDER_STEP) // FIXME: rename this flag?
        {
-               i = MSG_ReadFloat();
-               ent->alpha = MSG_ReadFloat();
-               if (i == 2 && MSG_ReadFloat() != 0.0)
-                       ent->effects |= EF_FULLBRIGHT;
-               if (ent->alpha == 0)
-                       ent->alpha = 1;
+               // make time identical for memcmp
+               new.time = ent->state_current.time;
+               if (memcmp(&new, &ent->state_current, sizeof(entity_state_t)))
+               {
+                       // state has changed
+                       ent->state_previous = ent->state_current;
+                       ent->state_current = new;
+                       // assume 10fps animation
+                       ent->state_previous.time = cl.mtime[0];
+                       ent->state_current.time = cl.mtime[0] + 0.1; //ent->state_previous.time + 0.1;
+               }
        }
-
-       //if ( bits & U_NOLERP )
-       //      ent->forcelink = true;
-       //if (bits & U_STEP) // FIXME: implement clientside interpolation of monsters
-
-       if ( forcelink )
-       {       // didn't have an update last message
-               VectorCopy (ent->msg_origins[0], ent->msg_origins[1]);
-               VectorCopy (ent->msg_origins[0], ent->origin);
-               VectorCopy (ent->msg_angles[0], ent->msg_angles[1]);
-               VectorCopy (ent->msg_angles[0], ent->angles);
-               ent->forcelink = true;
+       else
+       {
+               ent->state_previous = ent->state_current;
+               ent->state_current = new;
        }
 }
 
+char *bitprofilenames[32] =
+{
+       "U_MOREBITS",
+       "U_ORIGIN1",
+       "U_ORIGIN2",
+       "U_ORIGIN3",
+       "U_ANGLE2",
+       "U_STEP",
+       "U_FRAME",
+       "U_SIGNAL",
+       "U_ANGLE1",
+       "U_ANGLE3",
+       "U_MODEL",
+       "U_COLORMAP",
+       "U_SKIN",
+       "U_EFFECTS",
+       "U_LONGENTITY",
+       "U_EXTEND1",
+       "U_DELTA",
+       "U_ALPHA",
+       "U_SCALE",
+       "U_EFFECTS2",
+       "U_GLOWSIZE",
+       "U_GLOWCOLOR",
+       "obsolete U_COLORMOD",
+       "U_EXTEND2",
+       "U_GLOWTRAIL",
+       "U_VIEWMODEL",
+       "U_FRAME2",
+       "U_MODEL2",
+       "U_EXTERIORMODEL",
+       "U_UNUSED29",
+       "U_UNUSED30",
+       "U_EXTEND3",
+};
+
+void CL_BitProfile_f(void)
+{
+       int i;
+       Con_Printf("bitprofile: %i updates\n");
+       if (bitprofilecount)
+               for (i = 0;i < 32;i++)
+//                     if (bitprofile[i])
+                               Con_Printf("%s: %i %3.2f%%\n", bitprofilenames[i], bitprofile[i], bitprofile[i] * 100.0 / bitprofilecount);
+       Con_Printf("\n");
+       for (i = 0;i < 32;i++)
+               bitprofile[i] = 0;
+       bitprofilecount = 0;
+}
+
+void CL_EntityUpdateSetup(void)
+{
+       memset(entkill, 1, MAX_EDICTS);
+}
+
+void CL_EntityUpdateEnd(void)
+{
+       int i;
+       for (i = 1;i < MAX_EDICTS;i++)
+               if (entkill[i])
+                       cl_entities[i].state_previous.active = cl_entities[i].state_current.active = 0;
+}
+
 /*
 ==================
 CL_ParseBaseline
 ==================
 */
-void CL_ParseBaseline (entity_t *ent)
+void CL_ParseBaseline (entity_t *ent, int large)
 {
-       int                     i;
-       
-       ent->baseline.modelindex = MSG_ReadByte ();
-       ent->baseline.frame = MSG_ReadByte ();
-       ent->baseline.colormap = MSG_ReadByte();
-       ent->baseline.skin = MSG_ReadByte();
-       for (i=0 ; i<3 ; i++)
+       int i;
+
+       memset(&ent->state_baseline, 0, sizeof(entity_state_t));
+       ent->state_baseline.active = true;
+       if (large)
+       {
+               ent->state_baseline.modelindex = (unsigned short) MSG_ReadShort ();
+               ent->state_baseline.frame = (unsigned short) MSG_ReadShort ();
+       }
+       else
        {
-               ent->baseline.origin[i] = MSG_ReadCoord ();
-               ent->baseline.angles[i] = MSG_ReadAngle ();
+               ent->state_baseline.modelindex = MSG_ReadByte ();
+               ent->state_baseline.frame = MSG_ReadByte ();
        }
-       ent->baseline.alpha = 255;
-       ent->baseline.scale = 16;
-       ent->baseline.glowsize = 0;
-       ent->baseline.glowcolor = 254;
-       ent->baseline.colormod = 255;
+       ent->state_baseline.colormap = MSG_ReadByte();
+       ent->state_baseline.skin = MSG_ReadByte();
+       for (i = 0;i < 3;i++)
+       {
+               ent->state_baseline.origin[i] = MSG_ReadCoord ();
+               ent->state_baseline.angles[i] = MSG_ReadAngle ();
+       }
+       ent->state_baseline.alpha = 255;
+       ent->state_baseline.scale = 16;
+       ent->state_baseline.glowsize = 0;
+       ent->state_baseline.glowcolor = 254;
+       ent->state_previous = ent->state_current = ent->state_baseline;
+
+       CL_ValidateState(&ent->state_baseline);
 }
 
 
@@ -638,8 +1062,14 @@ Server information pertaining to this client only
 */
 void CL_ParseClientdata (int bits)
 {
-       int             i, j;
-       
+       int i, j;
+
+       bits &= 0xFFFF;
+       if (bits & SU_EXTEND1)
+               bits |= (MSG_ReadByte() << 16);
+       if (bits & SU_EXTEND2)
+               bits |= (MSG_ReadByte() << 24);
+
        if (bits & SU_VIEWHEIGHT)
                cl.viewheight = MSG_ReadChar ();
        else
@@ -654,9 +1084,18 @@ void CL_ParseClientdata (int bits)
        for (i=0 ; i<3 ; i++)
        {
                if (bits & (SU_PUNCH1<<i) )
-                       cl.punchangle[i] = MSG_ReadChar();
+               {
+                       if (dpprotocol)
+                               cl.punchangle[i] = MSG_ReadPreciseAngle();
+                       else
+                               cl.punchangle[i] = MSG_ReadChar();
+               }
                else
                        cl.punchangle[i] = 0;
+               if (bits & (SU_PUNCHVEC1<<i))
+                       cl.punchvector[i] = MSG_ReadFloatCoord();
+               else
+                       cl.punchvector[i] = 0;
                if (bits & (SU_VELOCITY1<<i) )
                        cl.mvelocity[0][i] = MSG_ReadChar()*16;
                else
@@ -688,10 +1127,10 @@ void CL_ParseClientdata (int bits)
 
        i = MSG_ReadByte ();
 
-       if (standard_quake)
-               cl.stats[STAT_ACTIVEWEAPON] = i;
-       else
+       if (gamemode == GAME_HIPNOTIC || gamemode == GAME_ROGUE)
                cl.stats[STAT_ACTIVEWEAPON] = (1<<i);
+       else
+               cl.stats[STAT_ACTIVEWEAPON] = i;
 }
 
 /*
@@ -699,34 +1138,30 @@ void CL_ParseClientdata (int bits)
 CL_ParseStatic
 =====================
 */
-void CL_ParseStatic (void)
+void CL_ParseStatic (int large)
 {
        entity_t *ent;
-       int             i;
-               
-       i = cl.num_statics;
-       if (i >= MAX_STATIC_ENTITIES)
+
+       if (cl.num_statics >= MAX_STATIC_ENTITIES)
                Host_Error ("Too many static entities");
-       ent = &cl_static_entities[i];
-       cl.num_statics++;
-       CL_ParseBaseline (ent);
+       ent = &cl_static_entities[cl.num_statics++];
+       CL_ParseBaseline (ent, large);
 
 // copy it to the current state
-       ent->model = cl.model_precache[ent->baseline.modelindex];
-       ent->frame = ent->baseline.frame;
-       ent->colormap = -1; // no special coloring
-       ent->skinnum = ent->baseline.skin;
-       ent->effects = ent->baseline.effects;
-       ent->alpha = 1;
-       ent->scale = 1;
-       ent->alpha = 1;
-       ent->glowsize = 0;
-       ent->glowcolor = 254;
-       ent->colormod[0] = ent->colormod[1] = ent->colormod[2] = 1;
-
-       VectorCopy (ent->baseline.origin, ent->origin);
-       VectorCopy (ent->baseline.angles, ent->angles); 
-       R_AddEfrags (ent);
+       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.framelerp = 0;
+       // make torchs play out of sync
+       ent->render.frame1time = ent->render.frame2time = lhrandom(-10, -1);
+       ent->render.colormap = -1; // no special coloring
+       ent->render.skinnum = ent->state_baseline.skin;
+       ent->render.effects = ent->state_baseline.effects;
+       ent->render.alpha = 1;
+       ent->render.scale = 1;
+       ent->render.alpha = 1;
+
+       VectorCopy (ent->state_baseline.origin, ent->render.origin);
+       VectorCopy (ent->state_baseline.angles, ent->render.angles);    
 }
 
 /*
@@ -734,27 +1169,52 @@ void CL_ParseStatic (void)
 CL_ParseStaticSound
 ===================
 */
-void CL_ParseStaticSound (void)
+void CL_ParseStaticSound (int large)
 {
        vec3_t          org;
        int                     sound_num, vol, atten;
-       int                     i;
-       
-       for (i=0 ; i<3 ; i++)
-               org[i] = MSG_ReadCoord ();
-       sound_num = MSG_ReadByte ();
+
+       MSG_ReadVector(org);
+       if (large)
+               sound_num = (unsigned short) MSG_ReadShort ();
+       else
+               sound_num = MSG_ReadByte ();
        vol = MSG_ReadByte ();
        atten = MSG_ReadByte ();
        
        S_StaticSound (cl.sound_precache[sound_num], org, vol, atten);
 }
 
+void CL_ParseEffect (void)
+{
+       vec3_t          org;
+       int                     modelindex, startframe, framecount, framerate;
 
-#define SHOWNET(x) if(cl_shownet.value==2)Con_Printf ("%3i:%s\n", msg_readcount-1, x);
+       MSG_ReadVector(org);
+       modelindex = MSG_ReadByte ();
+       startframe = MSG_ReadByte ();
+       framecount = MSG_ReadByte ();
+       framerate = MSG_ReadByte ();
 
-extern void SHOWLMP_decodehide();
-extern void SHOWLMP_decodeshow();
-extern void R_SetSkyBox(char* sky);
+       CL_Effect(org, modelindex, startframe, framecount, framerate);
+}
+
+void CL_ParseEffect2 (void)
+{
+       vec3_t          org;
+       int                     modelindex, startframe, framecount, framerate;
+
+       MSG_ReadVector(org);
+       modelindex = MSG_ReadShort ();
+       startframe = MSG_ReadShort ();
+       framecount = MSG_ReadByte ();
+       framerate = MSG_ReadByte ();
+
+       CL_Effect(org, modelindex, startframe, framecount, framerate);
+}
+
+
+#define SHOWNET(x) if(cl_shownet.integer==2)Con_Printf ("%3i:%s\n", msg_readcount-1, x);
 
 /*
 =====================
@@ -764,7 +1224,7 @@ CL_ParseServerMessage
 void CL_ParseServerMessage (void)
 {
        int                     cmd;
-       int                     i;
+       int                     i, entitiesupdated;
        byte            cmdlog[32];
        char            *cmdlogname[32], *temp;
        int                     cmdindex, cmdcount = 0;
@@ -772,9 +1232,9 @@ void CL_ParseServerMessage (void)
 //
 // if recording demos, copy the message out
 //
-       if (cl_shownet.value == 1)
+       if (cl_shownet.integer == 1)
                Con_Printf ("%i ",net_message.cursize);
-       else if (cl_shownet.value == 2)
+       else if (cl_shownet.integer == 2)
                Con_Printf ("------------------\n");
        
        cl.onground = false;    // unless the server says otherwise     
@@ -782,6 +1242,9 @@ void CL_ParseServerMessage (void)
 // parse the message
 //
        MSG_BeginReading ();
+
+       entitiesupdated = false;
+       CL_EntityUpdateSetup();
        
        while (1)
        {
@@ -793,7 +1256,7 @@ void CL_ParseServerMessage (void)
                if (cmd == -1)
                {
                        SHOWNET("END OF MESSAGE");
-                       return;         // end of message
+                       break;          // end of message
                }
 
                cmdindex = cmdcount & 31;
@@ -804,7 +1267,7 @@ void CL_ParseServerMessage (void)
                if (cmd & 128)
                {
                        // LordHavoc: fix for bizarre problem in MSVC that I do not understand (if I assign the string pointer directly it ends up storing a NULL pointer)
-                       temp = "svc_entity";
+                       temp = "entity";
                        cmdlogname[cmdindex] = temp;
                        SHOWNET("fast update");
                        CL_ParseUpdate (cmd&127);
@@ -842,7 +1305,7 @@ void CL_ParseServerMessage (void)
                                        i &= 31;
                                }
                                description[strlen(description)-1] = '\n'; // replace the last space with a newline
-                               Con_Printf(description);
+                               Con_Printf("%s", description);
                                Host_Error ("CL_ParseServerMessage: Illegible server message\n");
                        }
                        break;
@@ -852,10 +1315,12 @@ void CL_ParseServerMessage (void)
                        break;
                        
                case svc_time:
+                       // handle old protocols which do not have entity update ranges
+                       entitiesupdated = true;
                        cl.mtime[1] = cl.mtime[0];
                        cl.mtime[0] = MSG_ReadFloat ();                 
                        break;
-                       
+
                case svc_clientdata:
                        i = MSG_ReadShort ();
                        CL_ParseClientdata (i);
@@ -864,14 +1329,11 @@ void CL_ParseServerMessage (void)
                case svc_version:
                        i = MSG_ReadLong ();
                        if (i != PROTOCOL_VERSION && i != DPPROTOCOL_VERSION && i != 250)
-                       {
                                Host_Error ("CL_ParseServerMessage: Server is protocol %i, not %i or %i", i, DPPROTOCOL_VERSION, PROTOCOL_VERSION);
-                               return;
-                       }
                        Nehahrademcompatibility = false;
                        if (i == 250)
                                Nehahrademcompatibility = true;
-                       if (cls.demoplayback && demo_nehahra.value)
+                       if (cls.demoplayback && demo_nehahra.integer)
                                Nehahrademcompatibility = true;
                        dpprotocol = i == DPPROTOCOL_VERSION;
                        break;
@@ -890,14 +1352,14 @@ void CL_ParseServerMessage (void)
                case svc_stufftext:
                        Cbuf_AddText (MSG_ReadString ());
                        break;
-                       
+
                case svc_damage:
                        V_ParseDamage ();
                        break;
-                       
+
                case svc_serverinfo:
                        CL_ParseServerInfo ();
-                       vid.recalc_refdef = true;       // leave intermission full screen
+//                     vid.recalc_refdef = true;       // leave intermission full screen
                        break;
                        
                case svc_setangle:
@@ -912,21 +1374,25 @@ void CL_ParseServerMessage (void)
                case svc_lightstyle:
                        i = MSG_ReadByte ();
                        if (i >= MAX_LIGHTSTYLES)
-                               Host_Error ("svc_lightstyle > MAX_LIGHTSTYLES");
+                               Host_Error ("svc_lightstyle >= MAX_LIGHTSTYLES");
                        strncpy (cl_lightstyle[i].map,  MSG_ReadString(), MAX_STYLESTRING - 1);
                        cl_lightstyle[i].map[MAX_STYLESTRING - 1] = 0;
                        cl_lightstyle[i].length = strlen(cl_lightstyle[i].map);
                        break;
                        
                case svc_sound:
-                       CL_ParseStartSoundPacket();
+                       CL_ParseStartSoundPacket(false);
                        break;
-                       
+
+               case svc_sound2:
+                       CL_ParseStartSoundPacket(true);
+                       break;
+
                case svc_stopsound:
                        i = MSG_ReadShort();
                        S_StopSound(i>>3, i&7);
                        break;
-               
+
                case svc_updatename:
                        i = MSG_ReadByte ();
                        if (i >= cl.maxclients)
@@ -949,17 +1415,33 @@ void CL_ParseServerMessage (void)
                        break;
                        
                case svc_particle:
-                       R_ParseParticleEffect ();
+                       CL_ParseParticleEffect ();
+                       break;
+
+               case svc_effect:
+                       CL_ParseEffect ();
+                       break;
+
+               case svc_effect2:
+                       CL_ParseEffect2 ();
                        break;
 
                case svc_spawnbaseline:
                        i = MSG_ReadShort ();
                        // must use CL_EntityNum() to force cl.num_entities up
-                       CL_ParseBaseline (CL_EntityNum(i));
+                       CL_ParseBaseline (CL_EntityNum(i), false);
+                       break;
+               case svc_spawnbaseline2:
+                       i = MSG_ReadShort ();
+                       // must use CL_EntityNum() to force cl.num_entities up
+                       CL_ParseBaseline (CL_EntityNum(i), true);
                        break;
                case svc_spawnstatic:
-                       CL_ParseStatic ();
-                       break;                  
+                       CL_ParseStatic (false);
+                       break;
+               case svc_spawnstatic2:
+                       CL_ParseStatic (true);
+                       break;
                case svc_temp_entity:
                        CL_ParseTEnt ();
                        break;
@@ -996,7 +1478,11 @@ void CL_ParseServerMessage (void)
                        break;
                        
                case svc_spawnstaticsound:
-                       CL_ParseStaticSound ();
+                       CL_ParseStaticSound (false);
+                       break;
+
+               case svc_spawnstaticsound2:
+                       CL_ParseStaticSound (true);
                        break;
 
                case svc_cdtrack:
@@ -1011,20 +1497,20 @@ void CL_ParseServerMessage (void)
                case svc_intermission:
                        cl.intermission = 1;
                        cl.completed_time = cl.time;
-                       vid.recalc_refdef = true;       // go to full screen
+//                     vid.recalc_refdef = true;       // go to full screen
                        break;
 
                case svc_finale:
                        cl.intermission = 2;
                        cl.completed_time = cl.time;
-                       vid.recalc_refdef = true;       // go to full screen
-                       SCR_CenterPrint (MSG_ReadString ());                    
+//                     vid.recalc_refdef = true;       // go to full screen
+                       SCR_CenterPrint (MSG_ReadString ());
                        break;
 
                case svc_cutscene:
                        cl.intermission = 3;
                        cl.completed_time = cl.time;
-                       vid.recalc_refdef = true;       // go to full screen
+//                     vid.recalc_refdef = true;       // go to full screen
                        SCR_CenterPrint (MSG_ReadString ());                    
                        break;
 
@@ -1037,25 +1523,12 @@ void CL_ParseServerMessage (void)
                case svc_showlmp:
                        SHOWLMP_decodeshow();
                        break;
-       // LordHavoc: extra worldspawn fields (fog, sky, farclip)
                case svc_skybox:
                        R_SetSkyBox(MSG_ReadString());
                        break;
-               case svc_farclip:
-                       r_farclip.value = MSG_ReadCoord();
-                       break;
-               case svc_fog:
-                       if (MSG_ReadByte())
-                       {
-                               fog_density = MSG_ReadShort() * (1.0f / 4096.0f);
-                               fog_red = MSG_ReadByte() * (1.0 / 255.0);
-                               fog_green = MSG_ReadByte() * (1.0 / 255.0);
-                               fog_blue = MSG_ReadByte() * (1.0 / 255.0);
-                       }
-                       else
-                               fog_density = 0.0f;
-                       break;
                }
        }
-}
 
+       if (entitiesupdated)
+               CL_EntityUpdateEnd();
+}