X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=cl_parse.c;h=e49f1c3c44843677b233d5f83ba341cf12257160;hb=a2445d85eccf4d0c5766f44f02cd04a600c4bad4;hp=0a1d5ede033f538d6a83be4da115899354b382cd;hpb=8ee2396ccf926ee8221f533dd930e016d41c0755;p=xonotic%2Fdarkplaces.git

diff --git a/cl_parse.c b/cl_parse.c
index 0a1d5ede..e49f1c3c 100644
--- a/cl_parse.c
+++ b/cl_parse.c
@@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // cl_parse.c  -- parse a message received from the server
 
 #include "quakedef.h"
+#include "cdaudio.h"
 #include "cl_collision.h"
 
 char *svc_strings[128] =
@@ -113,7 +114,6 @@ void CL_ParseStartSoundPacket(int largesoundindex)
 	int 	volume;
 	int 	field_mask;
 	float 	attenuation;
-	int		i;
 
 	field_mask = MSG_ReadByte();
 
@@ -151,10 +151,9 @@ void CL_ParseStartSoundPacket(int largesoundindex)
 	if (ent >= MAX_EDICTS)
 		Host_Error ("CL_ParseStartSoundPacket: ent = %i", ent);
 
-	for (i = 0;i < 3;i++)
-		pos[i] = MSG_ReadCoord ();
+	MSG_ReadVector(pos, cl.protocol);
 
-	S_StartSound (ent, channel, cl.sound_precache[sound_num], pos, volume/255.0, attenuation);
+	S_StartSound (ent, channel, cl.sound_precache[sound_num], pos, volume/255.0f, attenuation);
 }
 
 /*
@@ -199,7 +198,7 @@ void CL_KeepaliveMessage (void)
 		lastmsg = time;
 		// write out a nop
 		// LordHavoc: must use unreliable because reliable could kill the sigon message!
-		Con_Printf("--> client to server keepalive\n");
+		Con_Print("--> client to server keepalive\n");
 		msg.data = buf;
 		msg.maxsize = sizeof(buf);
 		msg.cursize = 0;
@@ -215,7 +214,8 @@ void CL_ParseEntityLump(char *entdata)
 	const char *data;
 	char key[128], value[4096];
 	FOG_clear(); // LordHavoc: no fog until set
-	R_SetSkyBox(""); // LordHavoc: no environment mapped sky until set
+	// LordHavoc: default to the map's sky (q3 shader parsing sets this)
+	R_SetSkyBox(cl.worldmodel->brush.skybox);
 	data = entdata;
 	if (!data)
 		return;
@@ -268,7 +268,7 @@ static void CL_SignonReply (void)
 {
 	//char 	str[8192];
 
-Con_DPrintf ("CL_SignonReply: %i\n", cls.signon);
+Con_DPrintf("CL_SignonReply: %i\n", cls.signon);
 
 	switch (cls.signon)
 	{
@@ -313,7 +313,6 @@ Con_DPrintf ("CL_SignonReply: %i\n", cls.signon);
 CL_ParseServerInfo
 ==================
 */
-qbyte entlife[MAX_EDICTS];
 // FIXME: this is a lot of memory to be keeping around, this needs to be dynamically allocated and freed
 static char parse_model_precache[MAX_MODELS][MAX_QPATH];
 static char parse_sound_precache[MAX_SOUNDS][MAX_QPATH];
@@ -324,7 +323,7 @@ void CL_ParseServerInfo (void)
 	int nummodels, numsounds;
 	entity_t *ent;
 
-	Con_DPrintf ("Serverinfo packet received.\n");
+	Con_DPrint("Serverinfo packet received.\n");
 //
 // wipe the client_state_t struct
 //
@@ -335,12 +334,13 @@ void CL_ParseServerInfo (void)
 	// hack for unmarked Nehahra movie demos which had a custom protocol
 	if (i == PROTOCOL_QUAKE && cls.demoplayback && demo_nehahra.integer)
 		i = PROTOCOL_NEHAHRAMOVIE;
-	if (i != PROTOCOL_QUAKE && i != PROTOCOL_DARKPLACES1 && i != PROTOCOL_DARKPLACES2 && i != PROTOCOL_DARKPLACES3 && i != PROTOCOL_DARKPLACES4 && i != PROTOCOL_NEHAHRAMOVIE)
+	if (i != PROTOCOL_QUAKE && i != PROTOCOL_DARKPLACES1 && i != PROTOCOL_DARKPLACES2 && i != PROTOCOL_DARKPLACES3 && i != PROTOCOL_DARKPLACES4 && i != PROTOCOL_DARKPLACES5 && i != PROTOCOL_NEHAHRAMOVIE)
 	{
-		Host_Error("CL_ParseServerInfo: Server is protocol %i, not %i (Quake), %i (DP1), %i (DP2), %i (DP3), %i (DP4), or %i (Nehahra movie)", i, PROTOCOL_QUAKE, PROTOCOL_DARKPLACES1, PROTOCOL_DARKPLACES2, PROTOCOL_DARKPLACES3, PROTOCOL_DARKPLACES4, PROTOCOL_NEHAHRAMOVIE);
+		Host_Error("CL_ParseServerInfo: Server is protocol %i, not %i (Quake), %i (DP1), %i (DP2), %i (DP3), %i (DP4), %i (DP5), or %i (Nehahra movie)", i, PROTOCOL_QUAKE, PROTOCOL_DARKPLACES1, PROTOCOL_DARKPLACES2, PROTOCOL_DARKPLACES3, PROTOCOL_DARKPLACES4, PROTOCOL_DARKPLACES5, PROTOCOL_NEHAHRAMOVIE);
 		return;
 	}
 	cl.protocol = i;
+	Con_DPrintf("Protocol %i\n", cl.protocol);
 
 // parse maxclients
 	cl.maxclients = MSG_ReadByte ();
@@ -361,10 +361,7 @@ void CL_ParseServerInfo (void)
 
 // seperate the printfs so the server message can have a color
 	if (cl.protocol != PROTOCOL_NEHAHRAMOVIE) // no messages when playing the Nehahra movie
-	{
-		Con_Printf("\n\n\35\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\37\n\n");
-		Con_Printf("%c%s\n", 2, str);
-	}
+		Con_Printf("\n\n\35\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\37\n\n\2%s\n", str);
 
 	// check memory integrity
 	Mem_CheckSentinelsGlobal();
@@ -406,18 +403,12 @@ void CL_ParseServerInfo (void)
 	for (i = 1;i < nummodels;i++)
 	{
 		CL_KeepaliveMessage();
-		Mod_TouchModel(parse_model_precache[i]);
+		Mod_FindName(parse_model_precache[i]);
 	}
 	Mod_PurgeUnused();
 
 	// do the same for sounds
-	S_ClearUsed();
-	for (i = 1;i < numsounds;i++)
-	{
-		CL_KeepaliveMessage();
-		S_TouchSound(parse_sound_precache[i]);
-	}
-	S_PurgeUnused();
+	S_ServerSounds (parse_sound_precache, numsounds);
 
 	// now we try to load everything that is new
 
@@ -439,7 +430,9 @@ void CL_ParseServerInfo (void)
 	for (i=1 ; i<numsounds ; i++)
 	{
 		CL_KeepaliveMessage();
-		cl.sound_precache[i] = S_PrecacheSound(parse_sound_precache[i], true);
+
+		// Don't lock the sfx here, S_ServerSounds already did that 
+		cl.sound_precache[i] = S_PrecacheSound (parse_sound_precache[i], true, false);
 	}
 
 	// local state
@@ -447,14 +440,12 @@ void CL_ParseServerInfo (void)
 	// 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.scale = 1; // some of the renderer still relies on scale
 	ent->render.alpha = 1;
-	ent->render.flags = RENDER_SHADOW;
+	ent->render.flags = RENDER_SHADOW | RENDER_LIGHT;
 	Matrix4x4_CreateFromQuakeEntity(&ent->render.matrix, 0, 0, 0, 0, 0, 0, 1);
 	Matrix4x4_Invert_Simple(&ent->render.inversematrix, &ent->render.matrix);
 	CL_BoundingBoxForEntity(&ent->render);
-	// clear entlife array
-	memset(entlife, 0, MAX_EDICTS);
 
 	cl_num_entities = 1;
 
@@ -479,19 +470,22 @@ void CL_ValidateState(entity_state_t *s)
 		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);
+	if ((!s->flags & RENDER_COLORMAPPED) && s->colormap > cl.maxclients)
+	{
+		Con_DPrintf("CL_ValidateState: colormap (%i) > cl.maxclients (%i)\n", s->colormap, cl.maxclients);
+		s->colormap = 0;
+	}
 
 	model = cl.model_precache[s->modelindex];
 	Mod_CheckLoaded(model);
-	if (model && s->frame >= model->numframes)
+	if (model && model->type && s->frame >= model->numframes)
 	{
-		Con_DPrintf("CL_ValidateState: no such frame %i in \"%s\"\n", s->frame, model->name);
+		Con_DPrintf("CL_ValidateState: no such frame %i in \"%s\" (which has %i frames)\n", s->frame, model->name, model->numframes);
 		s->frame = 0;
 	}
-	if (model && s->skin > 0 && s->skin >= model->numskins)
+	if (model && model->type && s->skin > 0 && s->skin >= model->numskins && !(s->lightpflags & PFLAGS_FULLDYNAMIC))
 	{
-		Con_DPrintf("CL_ValidateState: no such skin %i in \"%s\"\n", s->skin, model->name);
+		Con_DPrintf("CL_ValidateState: no such skin %i in \"%s\" (which has %i skins)\n", s->skin, model->name, model->numskins);
 		s->skin = 0;
 	}
 }
@@ -499,11 +493,29 @@ void CL_ValidateState(entity_state_t *s)
 void CL_MoveLerpEntityStates(entity_t *ent)
 {
 	float odelta[3], adelta[3];
+	CL_ValidateState(&ent->state_current);
 	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)
+	if (!ent->state_previous.active || ent->state_previous.modelindex != ent->state_current.modelindex)
+	{
+		// reset all persistent stuff if this is a new entity
+		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);
+		// reset animation interpolation as well
+		ent->render.frame = ent->render.frame1 = ent->render.frame2 = ent->state_current.frame;
+		ent->render.frame1time = ent->render.frame2time = cl.time;
+		ent->render.framelerp = 1;
+		// reset various persistent stuff
+		ent->persistent.muzzleflash = 0;
+		VectorCopy(ent->state_current.origin, ent->persistent.trail_origin);
+	}
+	else if (cls.timedemo || cl_nolerp.integer || DotProduct(odelta, odelta) > 1000*1000)
 	{
-		// we definitely shouldn't lerp
+		// don't interpolate the move
 		ent->persistent.lerpdeltatime = 0;
 		ent->persistent.lerpstarttime = cl.mtime[1];
 		VectorCopy(ent->state_current.origin, ent->persistent.oldorigin);
@@ -527,12 +539,12 @@ void CL_MoveLerpEntityStates(entity_t *ent)
 	else
 	{
 		// not a monster
-		ent->persistent.lerpstarttime = cl.mtime[1];
+		ent->persistent.lerpstarttime = ent->state_previous.time;
 		// no lerp if it's singleplayer
 		if (cl.islocalgame)
 			ent->persistent.lerpdeltatime = 0;
 		else
-			ent->persistent.lerpdeltatime = cl.mtime[0] - cl.mtime[1];
+			ent->persistent.lerpdeltatime = bound(0, ent->state_current.time - ent->state_previous.time, 0.1);
 		VectorCopy(ent->persistent.neworigin, ent->persistent.oldorigin);
 		VectorCopy(ent->persistent.newangles, ent->persistent.oldangles);
 		VectorCopy(ent->state_current.origin, ent->persistent.neworigin);
@@ -540,170 +552,6 @@ void CL_MoveLerpEntityStates(entity_t *ent)
 	}
 }
 
-/*
-==================
-CL_ParseUpdate
-
-Parse an entity update message from the server
-If an entities model or origin changes from frame to frame, it must be
-relinked.  Other attributes can change without relinking.
-==================
-*/
-void CL_ParseUpdate (int bits)
-{
-	int num;
-	entity_t *ent;
-	entity_state_t new;
-
-	if (bits & U_MOREBITS)
-		bits |= (MSG_ReadByte()<<8);
-	if ((bits & U_EXTEND1) && cl.protocol != PROTOCOL_NEHAHRAMOVIE)
-	{
-		bits |= MSG_ReadByte() << 16;
-		if (bits & U_EXTEND2)
-			bits |= MSG_ReadByte() << 24;
-	}
-
-	if (bits & U_LONGENTITY)
-		num = (unsigned) MSG_ReadShort ();
-	else
-		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);
-
-	ent = cl_entities + num;
-
-	// 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
-	{
-		new = ent->state_baseline;
-		new.active = true;
-	}
-
-	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 (cl.protocol == PROTOCOL_NEHAHRAMOVIE && (bits & U_EXTEND1))
-	{
-		// LordHavoc: evil format
-		int i = MSG_ReadFloat();
-		int j = MSG_ReadFloat() * 255.0f;
-		if (i == 2)
-		{
-			i = MSG_ReadFloat();
-			if (i)
-				new.effects |= EF_FULLBRIGHT;
-		}
-		if (j < 0)
-			new.alpha = 0;
-		else if (j == 0 || j >= 255)
-			new.alpha = 255;
-		else
-			new.alpha = j;
-	}
-
-	if (new.active)
-		CL_ValidateState(&new);
-
-	ent->state_previous = ent->state_current;
-	ent->state_current = new;
-	if (ent->state_current.active)
-	{
-		CL_MoveLerpEntityStates(ent);
-		cl_entities_active[ent->state_current.number] = true;
-		// mark as visible (no kill this frame)
-		entlife[ent->state_current.number] = 2;
-	}
-}
-
-static entity_frame_t entityframe;
-extern mempool_t *cl_entities_mempool;
-void CL_ReadEntityFrame(void)
-{
-	if (cl.protocol == PROTOCOL_DARKPLACES1 || cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3)
-	{
-		int i;
-		entity_t *ent;
-		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;
-		}
-	}
-	else
-	{
-		if (!cl.entitydatabase4)
-			cl.entitydatabase4 = EntityFrame4_AllocDatabase(cl_entities_mempool);
-		EntityFrame4_CL_ReadFrame(cl.entitydatabase4);
-	}
-}
-
-void CL_EntityUpdateSetup(void)
-{
-}
-
-void CL_EntityUpdateEnd(void)
-{
-	if (cl.protocol == PROTOCOL_QUAKE || cl.protocol == PROTOCOL_NEHAHRAMOVIE || cl.protocol == PROTOCOL_DARKPLACES1 || cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3)
-	{
-		int i;
-		// disable entities that disappeared this frame
-		for (i = 1;i < MAX_EDICTS;i++)
-		{
-			// 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;
-			}
-		}
-	}
-}
-
 /*
 ==================
 CL_ParseBaseline
@@ -713,7 +561,8 @@ void CL_ParseBaseline (entity_t *ent, int large)
 {
 	int i;
 
-	ClearStateToDefault(&ent->state_baseline);
+	ent->state_baseline = defaultstate;
+	// FIXME: set ent->state_baseline.number?
 	ent->state_baseline.active = true;
 	if (large)
 	{
@@ -729,8 +578,8 @@ void CL_ParseBaseline (entity_t *ent, int large)
 	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.origin[i] = MSG_ReadCoord(cl.protocol);
+		ent->state_baseline.angles[i] = MSG_ReadAngle(cl.protocol);
 	}
 	CL_ValidateState(&ent->state_baseline);
 	ent->state_previous = ent->state_current = ent->state_baseline;
@@ -765,23 +614,39 @@ void CL_ParseClientdata (int bits)
 		cl.idealpitch = 0;
 
 	VectorCopy (cl.mvelocity[0], cl.mvelocity[1]);
-	for (i=0 ; i<3 ; i++)
+	for (i = 0;i < 3;i++)
 	{
 		if (bits & (SU_PUNCH1<<i) )
 		{
-			if (cl.protocol == PROTOCOL_DARKPLACES1 || cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3 || cl.protocol == PROTOCOL_DARKPLACES4)
-				cl.punchangle[i] = MSG_ReadPreciseAngle();
-			else
+			if (cl.protocol == PROTOCOL_DARKPLACES1 || cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3 || cl.protocol == PROTOCOL_DARKPLACES4 || cl.protocol == PROTOCOL_DARKPLACES5)
+				cl.punchangle[i] = MSG_ReadAngle16i();
+			else if (cl.protocol == PROTOCOL_QUAKE || cl.protocol == PROTOCOL_NEHAHRAMOVIE)
 				cl.punchangle[i] = MSG_ReadChar();
+			else
+				Host_Error("CL_ParseClientData: unknown cl.protocol %i\n", cl.protocol);
 		}
 		else
 			cl.punchangle[i] = 0;
 		if (bits & (SU_PUNCHVEC1<<i))
-			cl.punchvector[i] = MSG_ReadCoord();
+		{
+			if (cl.protocol == PROTOCOL_DARKPLACES1 || cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3 || cl.protocol == PROTOCOL_DARKPLACES4)
+				cl.punchvector[i] = MSG_ReadCoord16i();
+			else if (cl.protocol == PROTOCOL_DARKPLACES5)
+				cl.punchvector[i] = MSG_ReadCoord32f();
+			else
+				Host_Error("CL_ParseClientData: unknown cl.protocol %i\n", cl.protocol);
+		}
 		else
 			cl.punchvector[i] = 0;
 		if (bits & (SU_VELOCITY1<<i) )
-			cl.mvelocity[0][i] = MSG_ReadChar()*16;
+		{
+			if (cl.protocol == PROTOCOL_QUAKE || cl.protocol == PROTOCOL_NEHAHRAMOVIE || cl.protocol == PROTOCOL_DARKPLACES1 || cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3 || cl.protocol == PROTOCOL_DARKPLACES4)
+				cl.mvelocity[0][i] = MSG_ReadChar()*16;
+			else if (cl.protocol == PROTOCOL_DARKPLACES5)
+				cl.mvelocity[0][i] = MSG_ReadCoord32f();
+			else
+				Host_Error("CL_ParseClientData: unknown cl.protocol %i\n", cl.protocol);
+		}
 		else
 			cl.mvelocity[0][i] = 0;
 	}
@@ -798,21 +663,45 @@ void CL_ParseClientdata (int bits)
 	cl.onground = (bits & SU_ONGROUND) != 0;
 	cl.inwater = (bits & SU_INWATER) != 0;
 
-	cl.stats[STAT_WEAPONFRAME] = (bits & SU_WEAPONFRAME) ? MSG_ReadByte() : 0;
-	cl.stats[STAT_ARMOR] = (bits & SU_ARMOR) ? MSG_ReadByte() : 0;
-	cl.stats[STAT_WEAPON] = (bits & SU_WEAPON) ? MSG_ReadByte() : 0;
-	cl.stats[STAT_HEALTH] = MSG_ReadShort();
-	cl.stats[STAT_AMMO] = MSG_ReadByte();
-
-	cl.stats[STAT_SHELLS] = MSG_ReadByte();
-	cl.stats[STAT_NAILS] = MSG_ReadByte();
-	cl.stats[STAT_ROCKETS] = MSG_ReadByte();
-	cl.stats[STAT_CELLS] = MSG_ReadByte();
-
-	i = MSG_ReadByte ();
+	if (cl.protocol == PROTOCOL_DARKPLACES5)
+	{
+		cl.stats[STAT_WEAPONFRAME] = (bits & SU_WEAPONFRAME) ? MSG_ReadShort() : 0;
+		cl.stats[STAT_ARMOR] = (bits & SU_ARMOR) ? MSG_ReadShort() : 0;
+		cl.stats[STAT_WEAPON] = (bits & SU_WEAPON) ? MSG_ReadShort() : 0;
+		cl.stats[STAT_HEALTH] = MSG_ReadShort();
+		cl.stats[STAT_AMMO] = MSG_ReadShort();
+
+		cl.stats[STAT_SHELLS] = MSG_ReadShort();
+		cl.stats[STAT_NAILS] = MSG_ReadShort();
+		cl.stats[STAT_ROCKETS] = MSG_ReadShort();
+		cl.stats[STAT_CELLS] = MSG_ReadShort();
+		//cl.stats[STAT_GENERIC1] = MSG_ReadShort();
+		//cl.stats[STAT_GENERIC2] = MSG_ReadShort();
+		//cl.stats[STAT_GENERIC3] = MSG_ReadShort();
+		//cl.stats[STAT_GENERIC4] = MSG_ReadShort();
+		//cl.stats[STAT_GENERIC5] = MSG_ReadShort();
+		//cl.stats[STAT_GENERIC6] = MSG_ReadShort();
+
+		i = (unsigned short) MSG_ReadShort ();
+	}
+	else
+	{
+		cl.stats[STAT_WEAPONFRAME] = (bits & SU_WEAPONFRAME) ? MSG_ReadByte() : 0;
+		cl.stats[STAT_ARMOR] = (bits & SU_ARMOR) ? MSG_ReadByte() : 0;
+		cl.stats[STAT_WEAPON] = (bits & SU_WEAPON) ? MSG_ReadByte() : 0;
+		cl.stats[STAT_HEALTH] = MSG_ReadShort();
+		cl.stats[STAT_AMMO] = MSG_ReadByte();
+	
+		cl.stats[STAT_SHELLS] = MSG_ReadByte();
+		cl.stats[STAT_NAILS] = MSG_ReadByte();
+		cl.stats[STAT_ROCKETS] = MSG_ReadByte();
+		cl.stats[STAT_CELLS] = MSG_ReadByte();
+
+		i = MSG_ReadByte ();
+		if (gamemode == GAME_HIPNOTIC || gamemode == GAME_ROGUE)
+			i = (1<<i);
+	}
 
-	if (gamemode == GAME_HIPNOTIC || gamemode == GAME_ROGUE)
-		i = (1<<i);
 	// GAME_NEXUIZ hud needs weapon change time
 	// GAME_NEXUIZ uses a bit number as it's STAT_ACTIVEWEAPON, not a bitfield
 	// like other modes
@@ -823,7 +712,10 @@ void CL_ParseClientdata (int bits)
 	cl.viewzoomold = cl.viewzoomnew; // for interpolation
 	if (bits & SU_VIEWZOOM)
 	{
-		i = MSG_ReadByte();
+		if (cl.protocol == PROTOCOL_DARKPLACES5)
+			i = (unsigned short) MSG_ReadShort();
+		else
+			i = MSG_ReadByte();
 		if (i < 2)
 			i = 2;
 		cl.viewzoomnew = (float) i * (1.0f / 255.0f);
@@ -881,7 +773,7 @@ void CL_ParseStaticSound (int large)
 	vec3_t		org;
 	int			sound_num, vol, atten;
 
-	MSG_ReadVector(org);
+	MSG_ReadVector(org, cl.protocol);
 	if (large)
 		sound_num = (unsigned short) MSG_ReadShort ();
 	else
@@ -889,7 +781,7 @@ void CL_ParseStaticSound (int large)
 	vol = MSG_ReadByte ();
 	atten = MSG_ReadByte ();
 
-	S_StaticSound (cl.sound_precache[sound_num], org, vol, atten);
+	S_StaticSound (cl.sound_precache[sound_num], org, vol/255.0f, atten);
 }
 
 void CL_ParseEffect (void)
@@ -897,7 +789,7 @@ void CL_ParseEffect (void)
 	vec3_t		org;
 	int			modelindex, startframe, framecount, framerate;
 
-	MSG_ReadVector(org);
+	MSG_ReadVector(org, cl.protocol);
 	modelindex = MSG_ReadByte ();
 	startframe = MSG_ReadByte ();
 	framecount = MSG_ReadByte ();
@@ -911,9 +803,9 @@ void CL_ParseEffect2 (void)
 	vec3_t		org;
 	int			modelindex, startframe, framecount, framerate;
 
-	MSG_ReadVector(org);
-	modelindex = MSG_ReadShort ();
-	startframe = MSG_ReadShort ();
+	MSG_ReadVector(org, cl.protocol);
+	modelindex = (unsigned short) MSG_ReadShort ();
+	startframe = (unsigned short) MSG_ReadShort ();
 	framecount = MSG_ReadByte ();
 	framerate = MSG_ReadByte ();
 
@@ -933,20 +825,16 @@ sfx_t *cl_sfx_ric2;
 sfx_t *cl_sfx_ric3;
 sfx_t *cl_sfx_r_exp3;
 
-/*
-=================
-CL_ParseTEnt
-=================
-*/
+
 void CL_InitTEnts (void)
 {
-	cl_sfx_wizhit = S_PrecacheSound ("wizard/hit.wav", false);
-	cl_sfx_knighthit = S_PrecacheSound ("hknight/hit.wav", false);
-	cl_sfx_tink1 = S_PrecacheSound ("weapons/tink1.wav", false);
-	cl_sfx_ric1 = S_PrecacheSound ("weapons/ric1.wav", false);
-	cl_sfx_ric2 = S_PrecacheSound ("weapons/ric2.wav", false);
-	cl_sfx_ric3 = S_PrecacheSound ("weapons/ric3.wav", false);
-	cl_sfx_r_exp3 = S_PrecacheSound ("weapons/r_exp3.wav", false);
+	cl_sfx_wizhit = S_PrecacheSound ("sound/wizard/hit.wav", false, true);
+	cl_sfx_knighthit = S_PrecacheSound ("sound/hknight/hit.wav", false, true);
+	cl_sfx_tink1 = S_PrecacheSound ("sound/weapons/tink1.wav", false, true);
+	cl_sfx_ric1 = S_PrecacheSound ("sound/weapons/ric1.wav", false, true);
+	cl_sfx_ric2 = S_PrecacheSound ("sound/weapons/ric2.wav", false, true);
+	cl_sfx_ric3 = S_PrecacheSound ("sound/weapons/ric3.wav", false, true);
+	cl_sfx_r_exp3 = S_PrecacheSound ("sound/weapons/r_exp3.wav", false, true);
 }
 
 void CL_ParseBeam (model_t *m, int lightning)
@@ -955,9 +843,9 @@ void CL_ParseBeam (model_t *m, int lightning)
 	vec3_t start, end;
 	beam_t *b;
 
-	ent = MSG_ReadShort ();
-	MSG_ReadVector(start);
-	MSG_ReadVector(end);
+	ent = (unsigned short) MSG_ReadShort ();
+	MSG_ReadVector(start, cl.protocol);
+	MSG_ReadVector(end, cl.protocol);
 
 	if (ent >= MAX_EDICTS)
 	{
@@ -996,7 +884,7 @@ void CL_ParseBeam (model_t *m, int lightning)
 			return;
 		}
 	}
-	Con_Printf ("beam list overflow!\n");
+	Con_Print("beam list overflow!\n");
 }
 
 void CL_ParseTempEntity(void)
@@ -1017,30 +905,34 @@ void CL_ParseTempEntity(void)
 	{
 	case TE_WIZSPIKE:
 		// spike hitting wall
-		MSG_ReadVector(pos);
+		MSG_ReadVector(pos, cl.protocol);
 		CL_FindNonSolidLocation(pos, pos, 4);
 		Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
-		CL_AllocDlight(NULL, &tempmatrix, 150, 0.25f, 1.00f, 0.25f, 250, 0.2, 0, 0, false, 1);
+		CL_AllocDlight(NULL, &tempmatrix, 100, 0.12f, 0.50f, 0.12f, 500, 0.2, 0, 0, false, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
 		CL_RunParticleEffect(pos, vec3_origin, 20, 30);
 		S_StartSound(-1, 0, cl_sfx_wizhit, pos, 1, 1);
 		break;
 
 	case TE_KNIGHTSPIKE:
 		// spike hitting wall
-		MSG_ReadVector(pos);
+		MSG_ReadVector(pos, cl.protocol);
 		CL_FindNonSolidLocation(pos, pos, 4);
 		Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
-		CL_AllocDlight(NULL, &tempmatrix, 150, 1.0f, 0.60f, 0.20f, 250, 0.2, 0, 0, false, 1);
+		CL_AllocDlight(NULL, &tempmatrix, 100, 0.50f, 0.30f, 0.10f, 500, 0.2, 0, 0, false, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
 		CL_RunParticleEffect(pos, vec3_origin, 226, 20);
 		S_StartSound(-1, 0, cl_sfx_knighthit, pos, 1, 1);
 		break;
 
 	case TE_SPIKE:
 		// spike hitting wall
-		MSG_ReadVector(pos);
+		MSG_ReadVector(pos, cl.protocol);
 		CL_FindNonSolidLocation(pos, pos, 4);
-		// LordHavoc: changed to spark shower
-		CL_SparkShower(pos, vec3_origin, 15);
+		if (cl_particles_bulletimpacts.integer)
+		{
+			CL_SparkShower(pos, vec3_origin, 15, 1);
+			CL_Smoke(pos, vec3_origin, 15);
+			CL_BulletMark(pos);
+		}
 		if (rand() % 5)
 			S_StartSound(-1, 0, cl_sfx_tink1, pos, 1, 1);
 		else
@@ -1056,12 +948,17 @@ void CL_ParseTempEntity(void)
 		break;
 	case TE_SPIKEQUAD:
 		// quad spike hitting wall
-		MSG_ReadVector(pos);
+		MSG_ReadVector(pos, cl.protocol);
 		CL_FindNonSolidLocation(pos, pos, 4);
 		// LordHavoc: changed to spark shower
-		CL_SparkShower(pos, vec3_origin, 15);
+		if (cl_particles_bulletimpacts.integer)
+		{
+			CL_SparkShower(pos, vec3_origin, 15, 1);
+			CL_Smoke(pos, vec3_origin, 15);
+			CL_BulletMark(pos);
+		}
 		Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
-		CL_AllocDlight(NULL, &tempmatrix, 200, 0.1f, 0.1f, 1.0f, 1000, 0.2, 0, 0, true, 1);
+		CL_AllocDlight(NULL, &tempmatrix, 100, 0.15f, 0.15f, 1.5f, 500, 0.2, 0, 0, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
 		S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1);
 		if (rand() % 5)
 			S_StartSound(-1, 0, cl_sfx_tink1, pos, 1, 1);
@@ -1078,10 +975,15 @@ void CL_ParseTempEntity(void)
 		break;
 	case TE_SUPERSPIKE:
 		// super spike hitting wall
-		MSG_ReadVector(pos);
+		MSG_ReadVector(pos, cl.protocol);
 		CL_FindNonSolidLocation(pos, pos, 4);
 		// LordHavoc: changed to dust shower
-		CL_SparkShower(pos, vec3_origin, 30);
+		if (cl_particles_bulletimpacts.integer)
+		{
+			CL_SparkShower(pos, vec3_origin, 30, 1);
+			CL_Smoke(pos, vec3_origin, 30);
+			CL_BulletMark(pos);
+		}
 		if (rand() % 5)
 			S_StartSound(-1, 0, cl_sfx_tink1, pos, 1, 1);
 		else
@@ -1097,12 +999,17 @@ void CL_ParseTempEntity(void)
 		break;
 	case TE_SUPERSPIKEQUAD:
 		// quad super spike hitting wall
-		MSG_ReadVector(pos);
+		MSG_ReadVector(pos, cl.protocol);
 		CL_FindNonSolidLocation(pos, pos, 4);
 		// LordHavoc: changed to dust shower
-		CL_SparkShower(pos, vec3_origin, 30);
+		if (cl_particles_bulletimpacts.integer)
+		{
+			CL_SparkShower(pos, vec3_origin, 30, 1);
+			CL_Smoke(pos, vec3_origin, 30);
+			CL_BulletMark(pos);
+		}
 		Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
-		CL_AllocDlight(NULL, &tempmatrix, 200, 0.1f, 0.1f, 1.0f, 1000, 0.2, 0, 0, true, 1);
+		CL_AllocDlight(NULL, &tempmatrix, 100, 0.15f, 0.15f, 1.5f, 500, 0.2, 0, 0, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
 		if (rand() % 5)
 			S_StartSound(-1, 0, cl_sfx_tink1, pos, 1, 1);
 		else
@@ -1119,7 +1026,7 @@ void CL_ParseTempEntity(void)
 		// LordHavoc: added for improved blood splatters
 	case TE_BLOOD:
 		// blood puff
-		MSG_ReadVector(pos);
+		MSG_ReadVector(pos, cl.protocol);
 		CL_FindNonSolidLocation(pos, pos, 4);
 		dir[0] = MSG_ReadChar();
 		dir[1] = MSG_ReadChar();
@@ -1129,157 +1036,163 @@ void CL_ParseTempEntity(void)
 		break;
 	case TE_SPARK:
 		// spark shower
-		MSG_ReadVector(pos);
+		MSG_ReadVector(pos, cl.protocol);
 		CL_FindNonSolidLocation(pos, pos, 4);
 		dir[0] = MSG_ReadChar();
 		dir[1] = MSG_ReadChar();
 		dir[2] = MSG_ReadChar();
 		count = MSG_ReadByte();
-		CL_SparkShower(pos, dir, count);
+		CL_SparkShower(pos, dir, count, 1);
 		break;
 	case TE_PLASMABURN:
-		MSG_ReadVector(pos);
+		MSG_ReadVector(pos, cl.protocol);
 		CL_FindNonSolidLocation(pos, pos, 4);
 		Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
-		CL_AllocDlight(NULL, &tempmatrix, 200, 1, 1, 1, 1000, 0.2, 0, 0, true, 1);
+		CL_AllocDlight(NULL, &tempmatrix, 200, 1, 1, 1, 1000, 0.2, 0, 0, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
 		CL_PlasmaBurn(pos);
 		break;
 		// LordHavoc: added for improved gore
 	case TE_BLOODSHOWER:
 		// vaporized body
-		MSG_ReadVector(pos); // mins
-		MSG_ReadVector(pos2); // maxs
-		velspeed = MSG_ReadCoord(); // speed
-		count = MSG_ReadShort(); // number of particles
+		MSG_ReadVector(pos, cl.protocol); // mins
+		MSG_ReadVector(pos2, cl.protocol); // maxs
+		velspeed = MSG_ReadCoord(cl.protocol); // speed
+		count = (unsigned short) MSG_ReadShort(); // number of particles
 		CL_BloodShower(pos, pos2, velspeed, count);
 		break;
 	case TE_PARTICLECUBE:
 		// general purpose particle effect
-		MSG_ReadVector(pos); // mins
-		MSG_ReadVector(pos2); // maxs
-		MSG_ReadVector(dir); // dir
-		count = MSG_ReadShort(); // number of particles
+		MSG_ReadVector(pos, cl.protocol); // mins
+		MSG_ReadVector(pos2, cl.protocol); // maxs
+		MSG_ReadVector(dir, cl.protocol); // dir
+		count = (unsigned short) MSG_ReadShort(); // number of particles
 		colorStart = MSG_ReadByte(); // color
 		colorLength = MSG_ReadByte(); // gravity (1 or 0)
-		velspeed = MSG_ReadCoord(); // randomvel
+		velspeed = MSG_ReadCoord(cl.protocol); // randomvel
 		CL_ParticleCube(pos, pos2, dir, count, colorStart, colorLength, velspeed);
 		break;
 
 	case TE_PARTICLERAIN:
 		// general purpose particle effect
-		MSG_ReadVector(pos); // mins
-		MSG_ReadVector(pos2); // maxs
-		MSG_ReadVector(dir); // dir
-		count = MSG_ReadShort(); // number of particles
+		MSG_ReadVector(pos, cl.protocol); // mins
+		MSG_ReadVector(pos2, cl.protocol); // maxs
+		MSG_ReadVector(dir, cl.protocol); // dir
+		count = (unsigned short) MSG_ReadShort(); // number of particles
 		colorStart = MSG_ReadByte(); // color
 		CL_ParticleRain(pos, pos2, dir, count, colorStart, 0);
 		break;
 
 	case TE_PARTICLESNOW:
 		// general purpose particle effect
-		MSG_ReadVector(pos); // mins
-		MSG_ReadVector(pos2); // maxs
-		MSG_ReadVector(dir); // dir
-		count = MSG_ReadShort(); // number of particles
+		MSG_ReadVector(pos, cl.protocol); // mins
+		MSG_ReadVector(pos2, cl.protocol); // maxs
+		MSG_ReadVector(dir, cl.protocol); // dir
+		count = (unsigned short) MSG_ReadShort(); // number of particles
 		colorStart = MSG_ReadByte(); // color
 		CL_ParticleRain(pos, pos2, dir, count, colorStart, 1);
 		break;
 
 	case TE_GUNSHOT:
 		// bullet hitting wall
-		MSG_ReadVector(pos);
+		MSG_ReadVector(pos, cl.protocol);
 		CL_FindNonSolidLocation(pos, pos, 4);
-		// LordHavoc: changed to dust shower
-		CL_SparkShower(pos, vec3_origin, 15);
+		CL_SparkShower(pos, vec3_origin, 15, 1);
+		CL_Smoke(pos, vec3_origin, 15);
+		CL_BulletMark(pos);
 		break;
 
 	case TE_GUNSHOTQUAD:
 		// quad bullet hitting wall
-		MSG_ReadVector(pos);
+		MSG_ReadVector(pos, cl.protocol);
 		CL_FindNonSolidLocation(pos, pos, 4);
-		CL_SparkShower(pos, vec3_origin, 15);
+		CL_SparkShower(pos, vec3_origin, 15, 1);
+		CL_Smoke(pos, vec3_origin, 15);
+		CL_BulletMark(pos);
 		Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
-		CL_AllocDlight(NULL, &tempmatrix, 200, 0.1f, 0.1f, 1.0f, 1000, 0.2, 0, 0, true, 1);
+		CL_AllocDlight(NULL, &tempmatrix, 100, 0.15f, 0.15f, 1.5f, 500, 0.2, 0, 0, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
 		break;
 
 	case TE_EXPLOSION:
 		// rocket explosion
-		MSG_ReadVector(pos);
+		MSG_ReadVector(pos, cl.protocol);
 		CL_FindNonSolidLocation(pos, pos, 10);
 		CL_ParticleExplosion(pos);
 		// LordHavoc: boosted color from 1.0, 0.8, 0.4 to 1.25, 1.0, 0.5
 		Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
-		CL_AllocDlight(NULL, &tempmatrix, 350, 1.25f, 1.0f, 0.5f, 700, 0.5, 0, 0, true, 1);
+		CL_AllocDlight(NULL, &tempmatrix, 350, 4.0f, 2.0f, 0.50f, 700, 0.5, 0, 0, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
 		S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1);
 		break;
 
 	case TE_EXPLOSIONQUAD:
 		// quad rocket explosion
-		MSG_ReadVector(pos);
+		MSG_ReadVector(pos, cl.protocol);
 		CL_FindNonSolidLocation(pos, pos, 10);
 		CL_ParticleExplosion(pos);
 		Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
-		CL_AllocDlight(NULL, &tempmatrix, 600, 0.5f, 0.4f, 1.0f, 1200, 0.5, 0, 0, true, 1);
+		CL_AllocDlight(NULL, &tempmatrix, 350, 2.5f, 2.0f, 4.0f, 700, 0.5, 0, 0, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
 		S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1);
 		break;
 
 	case TE_EXPLOSION3:
 		// Nehahra movie colored lighting explosion
-		MSG_ReadVector(pos);
+		MSG_ReadVector(pos, cl.protocol);
 		CL_FindNonSolidLocation(pos, pos, 10);
 		CL_ParticleExplosion(pos);
 		Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
-		CL_AllocDlight(NULL, &tempmatrix, 350, MSG_ReadCoord(), MSG_ReadCoord(), MSG_ReadCoord(), 700, 0.5, 0, 0, true, 1);
+		color[0] = MSG_ReadCoord(cl.protocol) * (2.0f / 1.0f);
+		color[1] = MSG_ReadCoord(cl.protocol) * (2.0f / 1.0f);
+		color[2] = MSG_ReadCoord(cl.protocol) * (2.0f / 1.0f);
+		CL_AllocDlight(NULL, &tempmatrix, 350, color[0], color[1], color[2], 700, 0.5, 0, 0, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);	
 		S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1);
 		break;
 
 	case TE_EXPLOSIONRGB:
 		// colored lighting explosion
-		MSG_ReadVector(pos);
+		MSG_ReadVector(pos, cl.protocol);
 		CL_FindNonSolidLocation(pos, pos, 10);
 		CL_ParticleExplosion(pos);
-		color[0] = MSG_ReadByte() * (1.0 / 255.0);
-		color[1] = MSG_ReadByte() * (1.0 / 255.0);
-		color[2] = MSG_ReadByte() * (1.0 / 255.0);
+		color[0] = MSG_ReadByte() * (2.0f / 255.0f);
+		color[1] = MSG_ReadByte() * (2.0f / 255.0f);
+		color[2] = MSG_ReadByte() * (2.0f / 255.0f);
 		Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
-		CL_AllocDlight(NULL, &tempmatrix, 350, color[0], color[1], color[2], 700, 0.5, 0, 0, true, 1);
+		CL_AllocDlight(NULL, &tempmatrix, 350, color[0], color[1], color[2], 700, 0.5, 0, 0, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
 		S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1);
 		break;
 
 	case TE_TAREXPLOSION:
 		// tarbaby explosion
-		MSG_ReadVector(pos);
+		MSG_ReadVector(pos, cl.protocol);
 		CL_FindNonSolidLocation(pos, pos, 10);
 		CL_BlobExplosion(pos);
 
 		S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1);
 		S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1);
 		Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
-		CL_AllocDlight(NULL, &tempmatrix, 600, 0.8f, 0.4f, 1.0f, 1200, 0.5, 0, 0, true, 1);
+		CL_AllocDlight(NULL, &tempmatrix, 600, 1.6f, 0.8f, 2.0f, 1200, 0.5, 0, 0, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
 		break;
 
 	case TE_SMALLFLASH:
-		MSG_ReadVector(pos);
+		MSG_ReadVector(pos, cl.protocol);
 		CL_FindNonSolidLocation(pos, pos, 10);
 		Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
-		CL_AllocDlight(NULL, &tempmatrix, 200, 1, 1, 1, 1000, 0.2, 0, 0, true, 1);
+		CL_AllocDlight(NULL, &tempmatrix, 200, 2, 2, 2, 1000, 0.2, 0, 0, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
 		break;
 
 	case TE_CUSTOMFLASH:
-		MSG_ReadVector(pos);
+		MSG_ReadVector(pos, cl.protocol);
 		CL_FindNonSolidLocation(pos, pos, 4);
 		radius = MSG_ReadByte() * 8;
 		velspeed = (MSG_ReadByte() + 1) * (1.0 / 256.0);
-		color[0] = MSG_ReadByte() * (1.0 / 255.0);
-		color[1] = MSG_ReadByte() * (1.0 / 255.0);
-		color[2] = MSG_ReadByte() * (1.0 / 255.0);
+		color[0] = MSG_ReadByte() * (2.0f / 255.0f);
+		color[1] = MSG_ReadByte() * (2.0f / 255.0f);
+		color[2] = MSG_ReadByte() * (2.0f / 255.0f);
 		Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
-		CL_AllocDlight(NULL, &tempmatrix, radius, color[0], color[1], color[2], radius / velspeed, velspeed, 0, 0, true, 1);
+		CL_AllocDlight(NULL, &tempmatrix, radius, color[0], color[1], color[2], radius / velspeed, velspeed, 0, 0, true, 1, 0.25, 1, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
 		break;
 
 	case TE_FLAMEJET:
-		MSG_ReadVector(pos);
-		MSG_ReadVector(dir);
+		MSG_ReadVector(pos, cl.protocol);
+		MSG_ReadVector(dir, cl.protocol);
 		count = MSG_ReadByte();
 		CL_Flames(pos, dir, count);
 		break;
@@ -1287,14 +1200,14 @@ void CL_ParseTempEntity(void)
 	case TE_LIGHTNING1:
 		// lightning bolts
 		if (!cl_model_bolt)
-			cl_model_bolt = Mod_ForName("progs/bolt.mdl", true, false, false);
+			cl_model_bolt = Mod_ForName("progs/bolt.mdl", false, false, false);
 		CL_ParseBeam(cl_model_bolt, true);
 		break;
 
 	case TE_LIGHTNING2:
 		// lightning bolts
 		if (!cl_model_bolt2)
-			cl_model_bolt2 = Mod_ForName("progs/bolt2.mdl", true, false, false);
+			cl_model_bolt2 = Mod_ForName("progs/bolt2.mdl", false, false, false);
 		CL_ParseBeam(cl_model_bolt2, true);
 		break;
 
@@ -1320,67 +1233,66 @@ void CL_ParseTempEntity(void)
 		break;
 
 	case TE_LAVASPLASH:
-		pos[0] = MSG_ReadCoord();
-		pos[1] = MSG_ReadCoord();
-		pos[2] = MSG_ReadCoord();
+		MSG_ReadVector(pos, cl.protocol);
 		CL_LavaSplash(pos);
 		break;
 
 	case TE_TELEPORT:
-		pos[0] = MSG_ReadCoord();
-		pos[1] = MSG_ReadCoord();
-		pos[2] = MSG_ReadCoord();
+		MSG_ReadVector(pos, cl.protocol);
 		Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
-		CL_AllocDlight(NULL, &tempmatrix, 500, 1.0f, 1.0f, 1.0f, 1500, 99.0f, 0, 0, true, 1);
+		CL_AllocDlight(NULL, &tempmatrix, 500, 1.0f, 1.0f, 1.0f, 1500, 99.0f, 0, 0, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
 //		CL_TeleportSplash(pos);
 		break;
 
 	case TE_EXPLOSION2:
 		// color mapped explosion
-		MSG_ReadVector(pos);
+		MSG_ReadVector(pos, cl.protocol);
 		CL_FindNonSolidLocation(pos, pos, 10);
 		colorStart = MSG_ReadByte();
 		colorLength = MSG_ReadByte();
 		CL_ParticleExplosion2(pos, colorStart, colorLength);
 		tempcolor = (qbyte *)&palette_complete[(rand()%colorLength) + colorStart];
+		color[0] = tempcolor[0] * (2.0f / 255.0f);
+		color[1] = tempcolor[1] * (2.0f / 255.0f);
+		color[2] = tempcolor[2] * (2.0f / 255.0f);
 		Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
-		CL_AllocDlight(NULL, &tempmatrix, 350, tempcolor[0] * (1.0f / 255.0f), tempcolor[1] * (1.0f / 255.0f), tempcolor[2] * (1.0f / 255.0f), 700, 0.5, 0, 0, true, 1);
+		CL_AllocDlight(NULL, &tempmatrix, 350, color[0], color[1], color[2], 700, 0.5, 0, 0, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
 		S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1);
 		break;
 
 	case TE_TEI_G3:
-		MSG_ReadVector(pos);
-		MSG_ReadVector(pos2);
-		MSG_ReadVector(dir);
+		MSG_ReadVector(pos, cl.protocol);
+		MSG_ReadVector(pos2, cl.protocol);
+		MSG_ReadVector(dir, cl.protocol);
 		CL_BeamParticle(pos, pos2, 12, 1, 0.3, 0.1, 1, 1);
 		CL_BeamParticle(pos, pos2, 5, 1, 0.9, 0.3, 1, 1);
 		break;
 
 	case TE_TEI_SMOKE:
-		MSG_ReadVector(pos);
-		MSG_ReadVector(dir);
+		MSG_ReadVector(pos, cl.protocol);
+		MSG_ReadVector(dir, cl.protocol);
 		count = MSG_ReadByte();
 		CL_FindNonSolidLocation(pos, pos, 4);
 		CL_Tei_Smoke(pos, dir, count);
 		break;
 
 	case TE_TEI_BIGEXPLOSION:
-		MSG_ReadVector(pos);
+		MSG_ReadVector(pos, cl.protocol);
 		CL_FindNonSolidLocation(pos, pos, 10);
 		CL_ParticleExplosion(pos);
 		Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
-		CL_AllocDlight(NULL, &tempmatrix, 500, 1.25f, 1.0f, 0.5f, 500, 9999, 0, 0, true, 1);
+		CL_AllocDlight(NULL, &tempmatrix, 500, 2.5f, 2.0f, 1.0f, 500, 9999, 0, 0, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
 		S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1);
 		break;
 
 	case TE_TEI_PLASMAHIT:
-		MSG_ReadVector(pos);
-		MSG_ReadVector(dir);
+		MSG_ReadVector(pos, cl.protocol);
+		MSG_ReadVector(dir, cl.protocol);
 		count = MSG_ReadByte();
 		CL_FindNonSolidLocation(pos, pos, 5);
 		CL_Tei_PlasmaHit(pos, dir, count);
 		Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
-		CL_AllocDlight(NULL, &tempmatrix, 500, 0.3, 0.6, 1.0f, 2000, 9999, 0, 0, true, 1);
+		CL_AllocDlight(NULL, &tempmatrix, 500, 0.6, 1.2, 2.0f, 2000, 9999, 0, 0, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
 		break;
 
 	default:
@@ -1388,7 +1300,7 @@ void CL_ParseTempEntity(void)
 	}
 }
 
-#define SHOWNET(x) if(cl_shownet.integer==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];
 
@@ -1401,7 +1313,7 @@ int parsingerror = false;
 void CL_ParseServerMessage(void)
 {
 	int			cmd;
-	int			i, entitiesupdated;
+	int			i;
 	qbyte		cmdlog[32];
 	char		*cmdlogname[32], *temp;
 	int			cmdindex, cmdcount = 0;
@@ -1415,9 +1327,9 @@ void CL_ParseServerMessage(void)
 // if recording demos, copy the message out
 //
 	if (cl_shownet.integer == 1)
-		Con_Printf ("%f %i\n", realtime, net_message.cursize);
+		Con_Printf("%f %i\n", realtime, net_message.cursize);
 	else if (cl_shownet.integer == 2)
-		Con_Printf ("------------------\n");
+		Con_Print("------------------\n");
 
 	cl.onground = false;	// unless the server says otherwise
 //
@@ -1425,8 +1337,6 @@ void CL_ParseServerMessage(void)
 //
 	//MSG_BeginReading ();
 
-	entitiesupdated = false;
-
 	parsingerror = true;
 
 	while (1)
@@ -1459,7 +1369,7 @@ void CL_ParseServerMessage(void)
 				cls.signon = SIGNONS;
 				CL_SignonReply ();
 			}
-			CL_ParseUpdate (cmd&127);
+			EntityFrameQuake_ReadEntity (cmd&127);
 			continue;
 		}
 
@@ -1494,30 +1404,23 @@ void CL_ParseServerMessage(void)
 					i &= 31;
 				}
 				description[strlen(description)-1] = '\n'; // replace the last space with a newline
-				Con_Printf("%s", description);
+				Con_Print(description);
 				Host_Error ("CL_ParseServerMessage: Illegible server message\n");
 			}
 			break;
 
 		case svc_nop:
 			if (cls.signon < SIGNONS)
-				Con_Printf("<-- server to client keepalive\n");
+				Con_Print("<-- server to client keepalive\n");
 			break;
 
 		case svc_time:
-			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 ();
 			break;
 
 		case svc_clientdata:
-			i = MSG_ReadShort ();
+			i = (unsigned short) MSG_ReadShort ();
 			CL_ParseClientdata (i);
 			break;
 
@@ -1526,20 +1429,25 @@ void CL_ParseServerMessage(void)
 			// hack for unmarked Nehahra movie demos which had a custom protocol
 			if (i == PROTOCOL_QUAKE && cls.demoplayback && demo_nehahra.integer)
 				i = PROTOCOL_NEHAHRAMOVIE;
-			if (i != PROTOCOL_QUAKE && i != PROTOCOL_DARKPLACES1 && i != PROTOCOL_DARKPLACES2 && i != PROTOCOL_DARKPLACES3 && i != PROTOCOL_DARKPLACES4 && i != PROTOCOL_NEHAHRAMOVIE)
-				Host_Error("CL_ParseServerMessage: Server is protocol %i, not %i (Quake), %i (DP1), %i (DP2), %i (DP3), %i (DP4), or %i (Nehahra movie)", i, PROTOCOL_QUAKE, PROTOCOL_DARKPLACES1, PROTOCOL_DARKPLACES2, PROTOCOL_DARKPLACES3, PROTOCOL_DARKPLACES4, PROTOCOL_NEHAHRAMOVIE);
+			if (i != PROTOCOL_QUAKE && i != PROTOCOL_DARKPLACES1 && i != PROTOCOL_DARKPLACES2 && i != PROTOCOL_DARKPLACES3 && i != PROTOCOL_DARKPLACES4 && i != PROTOCOL_DARKPLACES5 && i != PROTOCOL_NEHAHRAMOVIE)
+				Host_Error("CL_ParseServerMessage: Server is protocol %i, not %i (Quake), %i (DP1), %i (DP2), %i (DP3), %i (DP4), %i (DP5), or %i (Nehahra movie)", i, PROTOCOL_QUAKE, PROTOCOL_DARKPLACES1, PROTOCOL_DARKPLACES2, PROTOCOL_DARKPLACES3, PROTOCOL_DARKPLACES4, PROTOCOL_DARKPLACES5, PROTOCOL_NEHAHRAMOVIE);
 			cl.protocol = i;
 			break;
 
 		case svc_disconnect:
-			Host_EndGame ("Server disconnected\n");
+			Con_Printf ("Server disconnected\n");
+			if (cls.demonum != -1)
+				CL_NextDemo ();
+			else
+				CL_Disconnect ();
+			break;
 
 		case svc_print:
-			Con_Printf ("%s", MSG_ReadString ());
+			Con_Print(MSG_ReadString());
 			break;
 
 		case svc_centerprint:
-			SCR_CenterPrint (MSG_ReadString ());
+			SCR_CenterPrint(MSG_ReadString ());
 			break;
 
 		case svc_stufftext:
@@ -1556,7 +1464,7 @@ void CL_ParseServerMessage(void)
 
 		case svc_setangle:
 			for (i=0 ; i<3 ; i++)
-				cl.viewangles[i] = MSG_ReadAngle ();
+				cl.viewangles[i] = MSG_ReadAngle (cl.protocol);
 			break;
 
 		case svc_setview:
@@ -1586,7 +1494,7 @@ void CL_ParseServerMessage(void)
 			break;
 
 		case svc_stopsound:
-			i = MSG_ReadShort();
+			i = (unsigned short) MSG_ReadShort();
 			S_StopSound(i>>3, i&7);
 			break;
 
@@ -1601,7 +1509,7 @@ void CL_ParseServerMessage(void)
 			i = MSG_ReadByte ();
 			if (i >= cl.maxclients)
 				Host_Error ("CL_ParseServerMessage: svc_updatefrags >= cl.maxclients");
-			cl.scores[i].frags = MSG_ReadShort ();
+			cl.scores[i].frags = (signed short) MSG_ReadShort ();
 			break;
 
 		case svc_updatecolors:
@@ -1624,13 +1532,13 @@ void CL_ParseServerMessage(void)
 			break;
 
 		case svc_spawnbaseline:
-			i = MSG_ReadShort ();
+			i = (unsigned short) MSG_ReadShort ();
 			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 ();
+			i = (unsigned short) MSG_ReadShort ();
 			if (i < 0 || i >= MAX_EDICTS)
 				Host_Error ("CL_ParseServerMessage: svc_spawnbaseline2: invalid entity number %i", i);
 			CL_ParseBaseline (cl_entities + i, true);
@@ -1651,6 +1559,7 @@ void CL_ParseServerMessage(void)
 				CDAudio_Pause ();
 			else
 				CDAudio_Resume ();
+			S_PauseGameSounds (cl.paused);
 			break;
 
 		case svc_signonnum:
@@ -1701,13 +1610,13 @@ void CL_ParseServerMessage(void)
 		case svc_finale:
 			cl.intermission = 2;
 			cl.completed_time = cl.time;
-			SCR_CenterPrint (MSG_ReadString ());
+			SCR_CenterPrint(MSG_ReadString ());
 			break;
 
 		case svc_cutscene:
 			cl.intermission = 3;
 			cl.completed_time = cl.time;
-			SCR_CenterPrint (MSG_ReadString ());
+			SCR_CenterPrint(MSG_ReadString ());
 			break;
 
 		case svc_sellscreen:
@@ -1717,12 +1626,12 @@ void CL_ParseServerMessage(void)
 			if (gamemode == GAME_TENEBRAE)
 			{
 				// repeating particle effect
-				MSG_ReadCoord();
-				MSG_ReadCoord();
-				MSG_ReadCoord();
-				MSG_ReadCoord();
-				MSG_ReadCoord();
-				MSG_ReadCoord();
+				MSG_ReadCoord(cl.protocol);
+				MSG_ReadCoord(cl.protocol);
+				MSG_ReadCoord(cl.protocol);
+				MSG_ReadCoord(cl.protocol);
+				MSG_ReadCoord(cl.protocol);
+				MSG_ReadCoord(cl.protocol);
 				MSG_ReadByte();
 				MSG_ReadLong();
 				MSG_ReadLong();
@@ -1735,9 +1644,9 @@ void CL_ParseServerMessage(void)
 			if (gamemode == GAME_TENEBRAE)
 			{
 				// particle effect
-				MSG_ReadCoord();
-				MSG_ReadCoord();
-				MSG_ReadCoord();
+				MSG_ReadCoord(cl.protocol);
+				MSG_ReadCoord(cl.protocol);
+				MSG_ReadCoord(cl.protocol);
 				MSG_ReadByte();
 				MSG_ReadString();
 			}
@@ -1764,13 +1673,19 @@ void CL_ParseServerMessage(void)
 				cls.signon = SIGNONS;
 				CL_SignonReply ();
 			}
-			CL_ReadEntityFrame();
+			if (cl.protocol == PROTOCOL_DARKPLACES1 || cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3)
+				EntityFrame_CL_ReadFrame();
+			else if (cl.protocol == PROTOCOL_DARKPLACES4)
+				EntityFrame4_CL_ReadFrame();
+			else if (cl.protocol == PROTOCOL_DARKPLACES5)
+				EntityFrame5_CL_ReadFrame();
+			else
+				Host_Error("CL_ParseServerMessage: svc_entities: unknown cl.protocol %i\n", cl.protocol);
 			break;
 		}
 	}
 
-	if (entitiesupdated)
-		CL_EntityUpdateEnd();
+	EntityFrameQuake_ISeeDeadEntities();
 
 	parsingerror = false;
 }
@@ -1779,7 +1694,7 @@ void CL_Parse_DumpPacket(void)
 {
 	if (!parsingerror)
 		return;
-	Con_Printf("Packet dump:\n");
+	Con_Print("Packet dump:\n");
 	SZ_HexDumpToConsole(&net_message);
 	parsingerror = false;
 }
@@ -1787,7 +1702,7 @@ void CL_Parse_DumpPacket(void)
 void CL_Parse_Init(void)
 {
 	// LordHavoc: added demo_nehahra cvar
-	cl_scores_mempool = Mem_AllocPool("client player info");
+	cl_scores_mempool = Mem_AllocPool("client player info", 0, NULL);
 	Cvar_RegisterVariable (&demo_nehahra);
 	if (gamemode == GAME_NEHAHRA)
 		Cvar_SetValue("demo_nehahra", 1);