X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=cl_parse.c;h=b33a23d79294976accaed6ede7ca3dcd15ad43d9;hb=af8286fa99958a1ac89a091f09bc48e1ee225e65;hp=9f12f9014a99d3d0e07d7c63362369d793892acb;hpb=5680867262036b514af3ae2fdc27b504675f30f7;p=xonotic%2Fdarkplaces.git

diff --git a/cl_parse.c b/cl_parse.c
index 9f12f901..b33a23d7 100644
--- a/cl_parse.c
+++ b/cl_parse.c
@@ -8,7 +8,7 @@ of the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 See the GNU General Public License for more details.
 
@@ -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
@@ -48,11 +48,11 @@ char *svc_strings[128] =
 	"svc_updatecolors",	// [byte] [byte]
 	"svc_particle",		// [vec3] <variable>
 	"svc_damage",			// [byte] impact [byte] blood [vec3] from
-	
+
 	"svc_spawnstatic",
 	"OBSOLETE svc_spawnbinary",
 	"svc_spawnbaseline",
-	
+
 	"svc_temp_entity",		// <variable>
 	"svc_setpause",
 	"svc_signonnum",
@@ -80,10 +80,16 @@ char *svc_strings[128] =
 	"", // 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
+	"svc_cgame", //				50		// [short] length [bytes] data
+	"svc_unusedlh1", //			51		// unused
+	"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
+	"svc_sound2", //			54		// short soundindex instead of byte
+	"svc_spawnbaseline2", //	55		// short modelindex instead of byte
+	"svc_spawnstatic2", //		56		// short modelindex instead of byte
+	"svc_entities", //			57		// [int] deltaframe [int] thisframe [float vector] eye [variable length] entitydata
+	"svc_unusedlh3", //			58
+	"svc_spawnstaticsound2", //	59		// [coord3] [short] samp [byte] vol [byte] aten
 };
 
 //=============================================================================
@@ -94,41 +100,12 @@ void CL_Parse_Init(void)
 {
 	// LordHavoc: added demo_nehahra cvar
 	Cvar_RegisterVariable (&demo_nehahra);
-	if (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
-
-/*
-===============
-CL_EntityNum
-
-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);
-		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];
-}
-
+int dpprotocol; // LordHavoc: version of network protocol, or 0 if not DarkPlaces
 
 /*
 ==================
@@ -145,7 +122,7 @@ void CL_ParseStartSoundPacket(int largesoundindex)
     float 	attenuation;
  	int		i;
 	           
-    field_mask = MSG_ReadByte(); 
+    field_mask = MSG_ReadByte();
 
     if (field_mask & SND_VOLUME)
 		volume = MSG_ReadByte ();
@@ -174,9 +151,9 @@ void CL_ParseStartSoundPacket(int largesoundindex)
 	
 	for (i=0 ; i<3 ; i++)
 		pos[i] = MSG_ReadCoord ();
- 
+
     S_StartSound (ent, channel, cl.sound_precache[sound_num], pos, volume/255.0, attenuation);
-}       
+}
 
 /*
 ==================
@@ -191,8 +168,9 @@ void CL_KeepaliveMessage (void)
 	float	time;
 	static float lastmsg;
 	int		ret;
+	int		c;
 	sizebuf_t	old;
-	byte		olddata[8192];
+	qbyte		olddata[8192];
 	
 	if (sv.active)
 		return;		// no need if server is local
@@ -209,14 +187,15 @@ void CL_KeepaliveMessage (void)
 		switch (ret)
 		{
 		default:
-			Host_Error ("CL_KeepaliveMessage: CL_GetMessage failed");		
+			Host_Error ("CL_KeepaliveMessage: CL_GetMessage failed");
 		case 0:
 			break;	// nothing waiting
 		case 1:
 			Host_Error ("CL_KeepaliveMessage: received a message");
 			break;
 		case 2:
-			if (MSG_ReadByte() != svc_nop)
+			c = MSG_ReadByte();
+			if (c != svc_nop)
 				Host_Error ("CL_KeepaliveMessage: datagram wasn't a nop");
 			break;
 		}
@@ -243,17 +222,14 @@ void CL_ParseEntityLump(char *entdata)
 {
 	char *data;
 	char key[128], value[4096];
-	char wadname[128];
-	int i, j, k;
 	FOG_clear(); // LordHavoc: no fog until set
 	R_SetSkyBox(""); // LordHavoc: no environment mapped sky until set
-	r_farclip.value = 6144; // LordHavoc: default farclip distance
 	data = entdata;
 	if (!data)
 		return;
 	data = COM_Parse(data);
 	if (!data)
-		return; // valid exit
+		return; // error
 	if (com_token[0] != '{')
 		return; // error
 	while (1)
@@ -262,8 +238,11 @@ void CL_ParseEntityLump(char *entdata)
 		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);
@@ -276,17 +255,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;
-		}
+			sscanf(value, "%f %f %f %f", &fog_density, &fog_red, &fog_green, &fog_blue);
 		else if (!strcmp("fog_density", key))
 			fog_density = atof(value);
 		else if (!strcmp("fog_red", key))
@@ -295,36 +265,56 @@ 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
+	}
+}
+
+/*
+=====================
+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)
 		{
-			if (hlbsp)
-			{
-				j = 0;
-				for (i = 0;i < 4096;i++)
-					if (value[i] != ';' && value[i] != '\\' && value[i] != '/' && value[i] != ':')
-						break;
-				if (value[i])
-				{
-					for (;i < 4096;i++)
-					{
-						// 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;
-						}
-					}
-				}
-			}
+			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);
+		MSG_WriteString (&cls.message, "spawn");
+		break;
+
+	case 3:
+		MSG_WriteByte (&cls.message, clc_stringcmd);
+		MSG_WriteString (&cls.message, "begin");
+		break;
+
+	case 4:
+		Con_ClearNotify();
+		break;
 	}
 }
 
@@ -333,14 +323,16 @@ void CL_ParseEntityLump(char *entdata)
 CL_ParseServerInfo
 ==================
 */
+qbyte entlife[MAX_EDICTS];
 void CL_ParseServerInfo (void)
 {
-	char	*str;
-	int		i;
-	int		nummodels, numsounds;
-	char	model_precache[MAX_MODELS][MAX_QPATH];
-	char	sound_precache[MAX_SOUNDS][MAX_QPATH];
-	
+	char *str;
+	int i;
+	int nummodels, numsounds;
+	char model_precache[MAX_MODELS][MAX_QPATH];
+	char sound_precache[MAX_SOUNDS][MAX_QPATH];
+	entity_t *ent;
+
 	Con_DPrintf ("Serverinfo packet received.\n");
 //
 // wipe the client_state_t struct
@@ -349,17 +341,19 @@ void CL_ParseServerInfo (void)
 
 // parse protocol version number
 	i = MSG_ReadLong ();
-	if (i != PROTOCOL_VERSION && i != DPPROTOCOL_VERSION && i != 250)
+	if (i != PROTOCOL_VERSION && i != DPPROTOCOL_VERSION1 && i != DPPROTOCOL_VERSION2 && i != DPPROTOCOL_VERSION3 && i != 250)
 	{
-		Con_Printf ("Server returned version %i, not %i or %i", i, DPPROTOCOL_VERSION, PROTOCOL_VERSION);
+		Con_Printf ("Server is protocol %i, not %i, %i, %i or %i", i, DPPROTOCOL_VERSION1, DPPROTOCOL_VERSION2, DPPROTOCOL_VERSION3, 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;
+	dpprotocol = i;
+	if (dpprotocol != DPPROTOCOL_VERSION1 && dpprotocol != DPPROTOCOL_VERSION2 && dpprotocol != DPPROTOCOL_VERSION3)
+		dpprotocol = 0;
 
 // parse maxclients
 	cl.maxclients = MSG_ReadByte ();
@@ -368,7 +362,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 ();
@@ -390,7 +384,9 @@ void CL_ParseServerInfo (void)
 // needlessly purge it
 //
 
-	Hunk_Check ();
+	Mem_CheckSentinelsGlobal();
+
+	Mod_ClearUsed();
 
 // precache models
 	memset (cl.model_precache, 0, sizeof(cl.model_precache));
@@ -401,16 +397,13 @@ void CL_ParseServerInfo (void)
 			break;
 		if (nummodels==MAX_MODELS)
 		{
-			Con_Printf ("Server sent too many model precaches\n");
+			Host_Error ("Server sent too many model precaches\n");
 			return;
 		}
 		if (strlen(str) >= MAX_QPATH)
 			Host_Error ("Server sent a precache name of %i characters (max %i)", strlen(str), MAX_QPATH - 1);
 		strcpy (model_precache[nummodels], str);
 		Mod_TouchModel (str);
-
-//		Hunk_Check ();
-
 	}
 
 // precache sounds
@@ -422,7 +415,7 @@ void CL_ParseServerInfo (void)
 			break;
 		if (numsounds==MAX_SOUNDS)
 		{
-			Con_Printf ("Server sent too many sound precaches\n");
+			Host_Error ("Server sent too many sound precaches\n");
 			return;
 		}
 		if (strlen(str) >= MAX_QPATH)
@@ -431,46 +424,52 @@ void CL_ParseServerInfo (void)
 		S_TouchSound (str);
 	}
 
+	Mod_PurgeUnused();
+
 //
 // now we try to load everything else until a cache allocation fails
 //
 
-	Hunk_Check ();
-
 	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);
-
-//		Hunk_Check ();
+		// LordHavoc: i == 1 means the first model is the world model
+		cl.model_precache[i] = Mod_ForName (model_precache[i], false, false, i == 1);
 
 		if (cl.model_precache[i] == NULL)
 		{
-			Con_Printf("Model %s not found\n", model_precache[i]);
+			Host_Error("Model %s not found\n", model_precache[i]);
 			return;
 		}
 		CL_KeepaliveMessage ();
 	}
 
-	Hunk_Check ();
-
 	S_BeginPrecaching ();
 	for (i=1 ; i<numsounds ; i++)
 	{
-		cl.sound_precache[i] = S_PrecacheSound (sound_precache[i]);
+		cl.sound_precache[i] = S_PrecacheSound (sound_precache[i], true);
 		CL_KeepaliveMessage ();
 	}
 	S_EndPrecaching ();
 
-
 // local state
-	cl_entities[0].render.model = cl.worldmodel = cl.model_precache[1];
+	ent = &cl_entities[0];
+	// entire entity array was cleared, so just fill in a few fields
+	ent->state_current.active = true;
+	ent->render.model = cl.worldmodel = cl.model_precache[1];
+	ent->render.scale = 1;
+	ent->render.alpha = 1;
+	VectorAdd(ent->render.origin, ent->render.model->normalmins, ent->render.mins);
+	VectorAdd(ent->render.origin, ent->render.model->normalmaxs, ent->render.maxs);
+	// clear entlife array
+	memset(entlife, 0, MAX_EDICTS);
 
-//	Hunk_Check ();
+	cl_num_entities = 1;
 
 	R_NewMap ();
 
-	Hunk_Check ();		// make sure nothing is hurt
+	CL_CGVM_Start();
+
+	Mem_CheckSentinelsGlobal();
 
 	noclip_anglehack = false;		// noclip is turned off at start
 }
@@ -490,11 +489,63 @@ void CL_ValidateState(entity_state_t *s)
 		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_DPrintf("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_DPrintf("CL_ValidateState: no such skin %i in \"%s\"\n", s->skin, model->name);
+		s->skin = 0;
+	}
+}
+
+void CL_MoveLerpEntityStates(entity_t *ent)
+{
+	float odelta[3], adelta[3];
+	VectorSubtract(ent->state_current.origin, ent->persistent.neworigin, odelta);
+	VectorSubtract(ent->state_current.angles, ent->persistent.newangles, adelta);
+	if (!ent->state_previous.active || cls.timedemo || DotProduct(odelta, odelta) > 1000*1000 || cl_nolerp.integer)
+	{
+		// we definitely shouldn't lerp
+		ent->persistent.lerpdeltatime = 0;
+		ent->persistent.lerpstarttime = cl.mtime[1];
+		VectorCopy(ent->state_current.origin, ent->persistent.oldorigin);
+		VectorCopy(ent->state_current.angles, ent->persistent.oldangles);
+		VectorCopy(ent->state_current.origin, ent->persistent.neworigin);
+		VectorCopy(ent->state_current.angles, ent->persistent.newangles);
+	}
+	else// if (ent->state_current.flags & RENDER_STEP)
+	{
+		// monster interpolation
+		if (DotProduct(odelta, odelta) + DotProduct(adelta, adelta) > 0.01)
+		{
+			ent->persistent.lerpdeltatime = cl.time - ent->persistent.lerpstarttime;
+			ent->persistent.lerpstarttime = cl.mtime[1];
+			VectorCopy(ent->persistent.neworigin, ent->persistent.oldorigin);
+			VectorCopy(ent->persistent.newangles, ent->persistent.oldangles);
+			VectorCopy(ent->state_current.origin, ent->persistent.neworigin);
+			VectorCopy(ent->state_current.angles, ent->persistent.newangles);
+		}
+	}
+	/*
+	else
+	{
+		// not a monster
+		ent->persistent.lerpstarttime = cl.mtime[1];
+		// no lerp if it's singleplayer
+		//if (sv.active && svs.maxclients == 1 && !ent->state_current.flags & RENDER_STEP)
+		//	ent->persistent.lerpdeltatime = 0;
+		//else
+			ent->persistent.lerpdeltatime = cl.mtime[0] - cl.mtime[1];
+		VectorCopy(ent->persistent.neworigin, ent->persistent.oldorigin);
+		VectorCopy(ent->persistent.newangles, ent->persistent.oldangles);
+		VectorCopy(ent->state_current.origin, ent->persistent.neworigin);
+		VectorCopy(ent->state_current.angles, ent->persistent.newangles);
+	}
+	*/
 }
 
 /*
@@ -506,18 +557,12 @@ 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, num, deltadie;
+	int i, num;
 	entity_t *ent;
-
-	if (cls.signon == SIGNONS - 1)
-	{	// first update is the final signon stage
-		cls.signon = SIGNONS;
-		CL_SignonReply ();
-	}
+	entity_state_t new;
 
 	if (bits & U_MOREBITS)
 		bits |= (MSG_ReadByte()<<8);
@@ -528,7 +573,7 @@ void CL_ParseUpdate (int bits)
 			bits |= MSG_ReadByte() << 24;
 	}
 
-	if (bits & U_LONGENTITY)	
+	if (bits & U_LONGENTITY)
 		num = (unsigned) MSG_ReadShort ();
 	else
 		num = (unsigned) MSG_ReadByte ();
@@ -538,53 +583,51 @@ void CL_ParseUpdate (int bits)
 	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);
+	ent = cl_entities + num;
 
 	for (i = 0;i < 32;i++)
 		if (bits & (1 << i))
 			bitprofile[i]++;
 	bitprofilecount++;
 
-	ent->state_previous = ent->state_current;
-	deltadie = false;
+	// note: this inherits the 'active' state of the baseline chosen
+	// (state_baseline is always active, state_current may not be active if
+	// the entity was missing in the last frame)
 	if (bits & U_DELTA)
+		new = ent->state_current;
+	else
 	{
-		if (!ent->state_current.active)
-			deltadie = true; // was not present in previous frame, leave hidden until next full update
+		new = ent->state_baseline;
+		new.active = true;
 	}
-	else
-		ent->state_current = ent->state_baseline;
 
-	ent->state_current.time = cl.mtime[0];
-
-	ent->state_current.flags = 0;
-	ent->state_current.active = true;
-	if (bits & U_MODEL)		ent->state_current.modelindex = (ent->state_current.modelindex & 0xFF00) | MSG_ReadByte();
-	if (bits & U_FRAME)		ent->state_current.frame = (ent->state_current.frame & 0xFF00) | MSG_ReadByte();
-	if (bits & U_COLORMAP)	ent->state_current.colormap = MSG_ReadByte();
-	if (bits & U_SKIN)		ent->state_current.skin = MSG_ReadByte();
-	if (bits & U_EFFECTS)	ent->state_current.effects = (ent->state_current.effects & 0xFF00) | MSG_ReadByte();
-	if (bits & U_ORIGIN1)	ent->state_current.origin[0] = MSG_ReadCoord();
-	if (bits & U_ANGLE1)	ent->state_current.angles[0] = MSG_ReadAngle();
-	if (bits & U_ORIGIN2)	ent->state_current.origin[1] = MSG_ReadCoord();
-	if (bits & U_ANGLE2)	ent->state_current.angles[1] = MSG_ReadAngle();
-	if (bits & U_ORIGIN3)	ent->state_current.origin[2] = MSG_ReadCoord();
-	if (bits & U_ANGLE3)	ent->state_current.angles[2] = MSG_ReadAngle();
-	if (bits & U_STEP)		ent->state_current.flags |= RENDER_STEP;
-	if (bits & U_ALPHA)		ent->state_current.alpha = MSG_ReadByte();
-	if (bits & U_SCALE)		ent->state_current.scale = MSG_ReadByte();
-	if (bits & U_EFFECTS2)	ent->state_current.effects = (ent->state_current.effects & 0x00FF) | (MSG_ReadByte() << 8);
-	if (bits & U_GLOWSIZE)	ent->state_current.glowsize = MSG_ReadByte();
-	if (bits & U_GLOWCOLOR)	ent->state_current.glowcolor = MSG_ReadByte();
-	if (bits & U_GLOWTRAIL) ent->state_current.flags |= RENDER_GLOWTRAIL;
-	if (bits & U_COLORMOD)	ent->state_current.colormod = MSG_ReadByte();
-	if (bits & U_FRAME2)	ent->state_current.frame = (ent->state_current.frame & 0x00FF) | (MSG_ReadByte() << 8);
-	if (bits & U_MODEL2)	ent->state_current.modelindex = (ent->state_current.modelindex & 0x00FF) | (MSG_ReadByte() << 8);
-	if (bits & U_VIEWMODEL)	ent->state_current.flags |= RENDER_VIEWMODEL;
-	if (bits & U_EXTERIORMODEL)	ent->state_current.flags |= RENDER_EXTERIORMODEL;
+	new.number = num;
+	new.time = cl.mtime[0];
+	new.flags = 0;
+	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();
+	// apparently the dpcrush demo uses this (unintended, and it uses white anyway)
+	if (bits & U_COLORMOD)	MSG_ReadByte();
+	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))
@@ -594,46 +637,52 @@ void CL_ParseUpdate (int bits)
 		int j = MSG_ReadFloat() * 255.0f;
 		if (i == 2)
 		{
-			if (MSG_ReadFloat())
-				ent->state_current.effects |= EF_FULLBRIGHT;
+			i = MSG_ReadFloat();
+			if (i)
+				new.effects |= EF_FULLBRIGHT;
 		}
 		if (j < 0)
-			ent->state_current.alpha = 0;
+			new.alpha = 0;
 		else if (j == 0 || j >= 255)
-			ent->state_current.alpha = 255;
+			new.alpha = 255;
 		else
-			ent->state_current.alpha = j;
+			new.alpha = j;
 	}
 
-	if (deltadie)
+	if (new.active)
+		CL_ValidateState(&new);
+
+	ent->state_previous = ent->state_current;
+	ent->state_current = new;
+	if (ent->state_current.active)
 	{
-		// hide the entity
-		ent->state_current.active = false;
+		CL_MoveLerpEntityStates(ent);
+		cl_entities_active[ent->state_current.number] = true;
+		// mark as visible (no kill this frame)
+		entlife[ent->state_current.number] = 2;
 	}
-	else
-	{
-		CL_ValidateState(&ent->state_current);
+}
 
-		/*
-		if (!ent->state_current.active)
-		{
-			if (bits & U_DELTA)
-			{
-				if (bits & U_MODEL)
-					Con_Printf("CL_ParseUpdate: delta NULL model on %i: %i %i\n", num, ent->state_previous.modelindex, ent->state_current.modelindex);
-				else
-					Con_Printf("CL_ParseUpdate: delta NULL model on %i: %i\n", num, ent->state_previous.modelindex);
-			}
-			else
-			{
-				if (bits & U_MODEL)
-					Con_Printf("CL_ParseUpdate:       NULL model on %i: %i %i\n", num, ent->state_baseline.modelindex, ent->state_current.modelindex);
-				else
-					Con_Printf("CL_ParseUpdate:       NULL model on %i: %i\n", num, ent->state_baseline.modelindex);
-			}
-		}
-		*/
+void CL_ReadEntityFrame(void)
+{
+	entity_t *ent;
+	entity_frame_t entityframe;
+	int i;
+	EntityFrame_Read(&cl.entitydatabase);
+	EntityFrame_FetchFrame(&cl.entitydatabase, EntityFrame_MostRecentlyRecievedFrameNum(&cl.entitydatabase), &entityframe);
+	for (i = 0;i < entityframe.numentities;i++)
+	{
+		// copy the states
+		ent = &cl_entities[entityframe.entitydata[i].number];
+		ent->state_previous = ent->state_current;
+		ent->state_current = entityframe.entitydata[i];
+		CL_MoveLerpEntityStates(ent);
+		// the entity lives again...
+		entlife[ent->state_current.number] = 2;
+		cl_entities_active[ent->state_current.number] = true;
 	}
+	VectorCopy(cl.viewentoriginnew, cl.viewentoriginold);
+	VectorCopy(entityframe.eye, cl.viewentoriginnew);
 }
 
 char *bitprofilenames[32] =
@@ -660,7 +709,7 @@ char *bitprofilenames[32] =
 	"U_EFFECTS2",
 	"U_GLOWSIZE",
 	"U_GLOWCOLOR",
-	"U_COLORMOD",
+	"obsolete U_COLORMOD",
 	"U_EXTEND2",
 	"U_GLOWTRAIL",
 	"U_VIEWMODEL",
@@ -678,8 +727,7 @@ void CL_BitProfile_f(void)
 	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("%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;
@@ -688,15 +736,24 @@ void CL_BitProfile_f(void)
 
 void CL_EntityUpdateSetup(void)
 {
-	memset(entkill, 1, MAX_EDICTS);
 }
 
 void CL_EntityUpdateEnd(void)
 {
 	int i;
+	// disable entities that disappeared this frame
 	for (i = 1;i < MAX_EDICTS;i++)
-		if (entkill[i])
-			cl_entities[i].state_previous.active = cl_entities[i].state_current.active = 0;
+	{
+		// clear only the entities that were active last frame but not this
+		// frame, don't waste time clearing all entities (which would cause
+		// cache misses)
+		if (entlife[i])
+		{
+			entlife[i]--;
+			if (!entlife[i])
+				cl_entities[i].state_previous.active = cl_entities[i].state_current.active = 0;
+		}
+	}
 }
 
 /*
@@ -731,7 +788,6 @@ void CL_ParseBaseline (entity_t *ent, int large)
 	ent->state_baseline.scale = 16;
 	ent->state_baseline.glowsize = 0;
 	ent->state_baseline.glowcolor = 254;
-	ent->state_baseline.colormod = 255;
 	ent->state_previous = ent->state_current = ent->state_baseline;
 
 	CL_ValidateState(&ent->state_baseline);
@@ -764,7 +820,7 @@ void CL_ParseClientdata (int bits)
 		cl.idealpitch = MSG_ReadChar ();
 	else
 		cl.idealpitch = 0;
-	
+
 	VectorCopy (cl.mvelocity[0], cl.mvelocity[1]);
 	for (i=0 ; i<3 ; i++)
 	{
@@ -778,7 +834,7 @@ void CL_ParseClientdata (int bits)
 		else
 			cl.punchangle[i] = 0;
 		if (bits & (SU_PUNCHVEC1<<i))
-			cl.punchvector[i] = MSG_ReadFloatCoord();
+			cl.punchvector[i] = MSG_ReadCoord();
 		else
 			cl.punchvector[i] = 0;
 		if (bits & (SU_VELOCITY1<<i) )
@@ -795,7 +851,7 @@ void CL_ParseClientdata (int bits)
 				cl.item_gettime[j] = cl.time;
 		cl.items = i;
 	}
-		
+
 	cl.onground = (bits & SU_ONGROUND) != 0;
 	cl.inwater = (bits & SU_INWATER) != 0;
 
@@ -812,10 +868,22 @@ void CL_ParseClientdata (int bits)
 
 	i = MSG_ReadByte ();
 
-	if (standard_quake)
+	if (gamemode == GAME_HIPNOTIC || gamemode == GAME_ROGUE)
+		cl.stats[STAT_ACTIVEWEAPON] = (1<<i);
+	else
 		cl.stats[STAT_ACTIVEWEAPON] = i;
+
+	cl.viewzoomold = cl.viewzoomnew; // for interpolation
+	if (bits & SU_VIEWZOOM)
+	{
+		i = MSG_ReadByte();
+		if (i < 2)
+			i = 2;
+		cl.viewzoomnew = (float) i * (1.0f / 255.0f);
+	}
 	else
-		cl.stats[STAT_ACTIVEWEAPON] = (1<<i);
+		cl.viewzoomnew = 1;
+
 }
 
 /*
@@ -826,29 +894,49 @@ CL_ParseStatic
 void CL_ParseStatic (int large)
 {
 	entity_t *ent;
-		
-	if (cl.num_statics >= MAX_STATIC_ENTITIES)
+
+	if (cl_num_static_entities >= cl_max_static_entities)
 		Host_Error ("Too many static entities");
-	ent = &cl_static_entities[cl.num_statics++];
+	ent = &cl_static_entities[cl_num_static_entities++];
 	CL_ParseBaseline (ent, large);
 
 // 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.framelerp = 0;
-	ent->render.lerp_starttime = -1;
 	// make torchs play out of sync
-	ent->render.frame1start = ent->render.frame2start = -(rand() & 32767);
+	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;
-	ent->render.colormod[0] = ent->render.colormod[1] = ent->render.colormod[2] = 1;
 
 	VectorCopy (ent->state_baseline.origin, ent->render.origin);
-	VectorCopy (ent->state_baseline.angles, ent->render.angles);	
+	VectorCopy (ent->state_baseline.angles, ent->render.angles);
+
+	if (ent->render.angles[0] || ent->render.angles[2])
+	{
+		// pitch or roll
+		VectorAdd(ent->render.origin, ent->render.model->rotatedmins, ent->render.mins);
+		VectorAdd(ent->render.origin, ent->render.model->rotatedmaxs, ent->render.maxs);
+	}
+	else if (ent->render.angles[1])
+	{
+		// yaw
+		VectorAdd(ent->render.origin, ent->render.model->yawmins, ent->render.mins);
+		VectorAdd(ent->render.origin, ent->render.model->yawmaxs, ent->render.maxs);
+	}
+	else
+	{
+		VectorAdd(ent->render.origin, ent->render.model->normalmins, ent->render.mins);
+		VectorAdd(ent->render.origin, ent->render.model->normalmaxs, ent->render.maxs);
+	}
+
+	// This is definitely cheating...
+	if (ent->render.model == NULL)
+		cl_num_static_entities--;
 }
 
 /*
@@ -868,7 +956,7 @@ void CL_ParseStaticSound (int large)
 		sound_num = MSG_ReadByte ();
 	vol = MSG_ReadByte ();
 	atten = MSG_ReadByte ();
-	
+
 	S_StaticSound (cl.sound_precache[sound_num], org, vol, atten);
 }
 
@@ -901,7 +989,9 @@ void CL_ParseEffect2 (void)
 }
 
 
-#define SHOWNET(x) if(cl_shownet.value==2)Con_Printf ("%3i:%s\n", msg_readcount-1, x);
+#define SHOWNET(x) if(cl_shownet.integer==2)Con_Printf ("%3i:%s\n", msg_readcount-1, x);
+
+static qbyte cgamenetbuffer[65536];
 
 /*
 =====================
@@ -912,27 +1002,26 @@ void CL_ParseServerMessage (void)
 {
 	int			cmd;
 	int			i, entitiesupdated;
-	byte		cmdlog[32];
+	qbyte		cmdlog[32];
 	char		*cmdlogname[32], *temp;
 	int			cmdindex, cmdcount = 0;
-	
+
 //
 // 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	
+
+	cl.onground = false;	// unless the server says otherwise
 //
 // parse the message
 //
 	MSG_BeginReading ();
 
 	entitiesupdated = false;
-	CL_EntityUpdateSetup();
-	
+
 	while (1)
 	{
 		if (msg_badread)
@@ -957,6 +1046,12 @@ void CL_ParseServerMessage (void)
 			temp = "entity";
 			cmdlogname[cmdindex] = temp;
 			SHOWNET("fast update");
+			if (cls.signon == SIGNONS - 1)
+			{
+				// first update is the final signon stage
+				cls.signon = SIGNONS;
+				CL_SignonReply ();
+			}
 			CL_ParseUpdate (cmd&127);
 			continue;
 		}
@@ -969,7 +1064,7 @@ void CL_ParseServerMessage (void)
 			temp = "<unknown>";
 			cmdlogname[cmdindex] = temp;
 		}
-	
+
 		// other commands
 		switch (cmd)
 		{
@@ -992,72 +1087,80 @@ 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;
-			
+
 		case svc_nop:
-//			Con_Printf ("svc_nop\n");
 			break;
-			
+
 		case svc_time:
-			// handle old protocols which do not have entity update ranges
-			entitiesupdated = true;
+			if (!entitiesupdated)
+			{
+				// this is a new frame, we'll be seeing entities,
+				// so prepare for entity updates
+				CL_EntityUpdateSetup();
+				entitiesupdated = true;
+			}
 			cl.mtime[1] = cl.mtime[0];
-			cl.mtime[0] = MSG_ReadFloat ();			
+			cl.mtime[0] = MSG_ReadFloat ();
 			break;
-			
+
 		case svc_clientdata:
 			i = MSG_ReadShort ();
 			CL_ParseClientdata (i);
 			break;
-		
+
 		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);
+			if (i != PROTOCOL_VERSION && i != DPPROTOCOL_VERSION1 && i != DPPROTOCOL_VERSION2 && i != DPPROTOCOL_VERSION3 && i != 250)
+				Host_Error ("CL_ParseServerMessage: Server is protocol %i, not %i, %i, %i or %i", i, DPPROTOCOL_VERSION1, DPPROTOCOL_VERSION2, DPPROTOCOL_VERSION3, PROTOCOL_VERSION);
 			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;
+			dpprotocol = i;
+			if (dpprotocol != DPPROTOCOL_VERSION1 && dpprotocol != DPPROTOCOL_VERSION2 && dpprotocol != DPPROTOCOL_VERSION3)
+				dpprotocol = 0;
 			break;
-			
+
 		case svc_disconnect:
 			Host_EndGame ("Server disconnected\n");
 
 		case svc_print:
 			Con_Printf ("%s", MSG_ReadString ());
 			break;
-			
+
 		case svc_centerprint:
 			SCR_CenterPrint (MSG_ReadString ());
 			break;
-			
+
 		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
 			break;
-			
+
 		case svc_setangle:
 			for (i=0 ; i<3 ; i++)
 				cl.viewangles[i] = MSG_ReadAngle ();
 			break;
-			
+
 		case svc_setview:
 			cl.viewentity = MSG_ReadShort ();
+			// LordHavoc: assume first setview recieved is the real player entity
+			if (!cl.playerentity)
+				cl.playerentity = cl.viewentity;
 			break;
-					
+
 		case svc_lightstyle:
 			i = MSG_ReadByte ();
 			if (i >= MAX_LIGHTSTYLES)
@@ -1066,7 +1169,7 @@ void CL_ParseServerMessage (void)
 			cl_lightstyle[i].map[MAX_STYLESTRING - 1] = 0;
 			cl_lightstyle[i].length = strlen(cl_lightstyle[i].map);
 			break;
-			
+
 		case svc_sound:
 			CL_ParseStartSoundPacket(false);
 			break;
@@ -1079,30 +1182,33 @@ void CL_ParseServerMessage (void)
 			i = MSG_ReadShort();
 			S_StopSound(i>>3, i&7);
 			break;
-		
+
 		case svc_updatename:
 			i = MSG_ReadByte ();
 			if (i >= cl.maxclients)
-				Host_Error ("CL_ParseServerMessage: svc_updatename >= MAX_SCOREBOARD");
+				Host_Error ("CL_ParseServerMessage: svc_updatename >= cl.maxclients");
 			strcpy (cl.scores[i].name, MSG_ReadString ());
 			break;
-			
+
 		case svc_updatefrags:
 			i = MSG_ReadByte ();
 			if (i >= cl.maxclients)
-				Host_Error ("CL_ParseServerMessage: svc_updatefrags >= MAX_SCOREBOARD");
+				Host_Error ("CL_ParseServerMessage: svc_updatefrags >= cl.maxclients");
 			cl.scores[i].frags = MSG_ReadShort ();
-			break;			
+			break;
 
 		case svc_updatecolors:
 			i = MSG_ReadByte ();
 			if (i >= cl.maxclients)
-				Host_Error ("CL_ParseServerMessage: svc_updatecolors >= MAX_SCOREBOARD");
+				Host_Error ("CL_ParseServerMessage: svc_updatecolors >= cl.maxclients");
 			cl.scores[i].colors = MSG_ReadByte ();
+			// update our color cvar if our color changed
+			if (i == cl.playerentity - 1)
+				Cvar_SetValue ("_cl_color", cl.scores[i].colors);
 			break;
-			
+
 		case svc_particle:
-			R_ParseParticleEffect ();
+			CL_ParseParticleEffect ();
 			break;
 
 		case svc_effect:
@@ -1115,13 +1221,15 @@ void CL_ParseServerMessage (void)
 
 		case svc_spawnbaseline:
 			i = MSG_ReadShort ();
-			// must use CL_EntityNum() to force cl.num_entities up
-			CL_ParseBaseline (CL_EntityNum(i), false);
+			if (i < 0 || i >= MAX_EDICTS)
+				Host_Error ("CL_ParseServerMessage: svc_spawnbaseline: invalid entity number %i", i);
+			CL_ParseBaseline (cl_entities + 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);
+			if (i < 0 || i >= MAX_EDICTS)
+				Host_Error ("CL_ParseServerMessage: svc_spawnbaseline2: invalid entity number %i", i);
+			CL_ParseBaseline (cl_entities + i, true);
 			break;
 		case svc_spawnstatic:
 			CL_ParseStatic (false);
@@ -1140,7 +1248,7 @@ void CL_ParseServerMessage (void)
 			else
 				CDAudio_Resume ();
 			break;
-			
+
 		case svc_signonnum:
 			i = MSG_ReadByte ();
 			if (i <= cls.signon)
@@ -1163,7 +1271,7 @@ void CL_ParseServerMessage (void)
 				Host_Error ("svc_updatestat: %i is invalid", i);
 			cl.stats[i] = MSG_ReadLong ();
 			break;
-			
+
 		case svc_spawnstaticsound:
 			CL_ParseStaticSound (false);
 			break;
@@ -1176,29 +1284,26 @@ void CL_ParseServerMessage (void)
 			cl.cdtrack = MSG_ReadByte ();
 			cl.looptrack = MSG_ReadByte ();
 			if ( (cls.demoplayback || cls.demorecording) && (cls.forcetrack != -1) )
-				CDAudio_Play ((byte)cls.forcetrack, true);
+				CDAudio_Play ((qbyte)cls.forcetrack, true);
 			else
-				CDAudio_Play ((byte)cl.cdtrack, true);
+				CDAudio_Play ((qbyte)cl.cdtrack, true);
 			break;
 
 		case svc_intermission:
 			cl.intermission = 1;
 			cl.completed_time = cl.time;
-			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 ());			
+			SCR_CenterPrint (MSG_ReadString ());
 			break;
 
 		case svc_cutscene:
 			cl.intermission = 3;
 			cl.completed_time = cl.time;
-			vid.recalc_refdef = true;	// go to full screen
-			SCR_CenterPrint (MSG_ReadString ());			
+			SCR_CenterPrint (MSG_ReadString ());
 			break;
 
 		case svc_sellscreen:
@@ -1213,9 +1318,29 @@ void CL_ParseServerMessage (void)
 		case svc_skybox:
 			R_SetSkyBox(MSG_ReadString());
 			break;
+		case svc_cgame:
+			{
+				int length;
+				length = (int) ((unsigned short) MSG_ReadShort());
+				for (i = 0;i < length;i++)
+					cgamenetbuffer[i] = MSG_ReadByte();
+				if (!msg_badread)
+					CL_CGVM_ParseNetwork(cgamenetbuffer, length);
+			}
+			break;
+		case svc_entities:
+			if (cls.signon == SIGNONS - 1)
+			{
+				// first update is the final signon stage
+				cls.signon = SIGNONS;
+				CL_SignonReply ();
+			}
+			CL_ReadEntityFrame();
+			break;
 		}
 	}
 
 	if (entitiesupdated)
 		CL_EntityUpdateEnd();
 }
+