X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=cl_parse.c;h=04879f66683ade300075c51dc379663a24879f20;hb=823d8a2d16635f92223b991cb36ae0104fb6d88e;hp=160a7bb2fb0c7674d345350b7a7e95d1a22cdfa5;hpb=812ff6ba44c87de88a410e493b8093033867b12c;p=xonotic%2Fdarkplaces.git

diff --git a/cl_parse.c b/cl_parse.c
index 160a7bb2..04879f66 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 "cl_collision.h"
 
 char *svc_strings[128] =
 {
@@ -95,9 +96,7 @@ char *svc_strings[128] =
 //=============================================================================
 
 cvar_t demo_nehahra = {0, "demo_nehahra", "0"};
-
-qboolean Nehahrademcompatibility; // LordHavoc: to allow playback of the early Nehahra movie segments
-int dpprotocol; // LordHavoc: version of network protocol, or 0 if not DarkPlaces
+cvar_t developer_networkentities = {0, "developer_networkentities", "0"};
 
 mempool_t *cl_scores_mempool;
 
@@ -195,14 +194,19 @@ void CL_KeepaliveMessage (void)
 
 	if (cls.netcon && NetConn_CanSendMessage(cls.netcon) && (time = Sys_DoubleTime()) - lastmsg >= 5)
 	{
+		sizebuf_t	msg;
+		qbyte		buf[4];
 		lastmsg = time;
 		// write out a nop
+		// LordHavoc: must use unreliable because reliable could kill the sigon message!
 		Con_Printf("--> client to server keepalive\n");
-		MSG_WriteByte(&cls.message, clc_nop);
-		NetConn_SendReliableMessage(cls.netcon, &cls.message);
-		SZ_Clear(&cls.message);
+		msg.data = buf;
+		msg.maxsize = sizeof(buf);
+		msg.cursize = 0;
+		MSG_WriteChar(&msg, svc_nop);
+		NetConn_SendUnreliableMessage(cls.netcon, &msg);
 		// try not to utterly crush the computer with work, that's just rude
-		Sys_Sleep();
+		Sys_Sleep(1);
 	}
 }
 
@@ -215,25 +219,25 @@ void CL_ParseEntityLump(char *entdata)
 	data = entdata;
 	if (!data)
 		return;
-	if (!COM_ParseToken(&data))
+	if (!COM_ParseToken(&data, false))
 		return; // error
 	if (com_token[0] != '{')
 		return; // error
 	while (1)
 	{
-		if (!COM_ParseToken(&data))
+		if (!COM_ParseToken(&data, false))
 			return; // error
 		if (com_token[0] == '}')
 			break; // end of worldspawn
 		if (com_token[0] == '_')
-			strcpy(key, com_token + 1);
+			strlcpy (key, com_token + 1, sizeof (key));
 		else
-			strcpy(key, com_token);
+			strlcpy (key, com_token, sizeof (key));
 		while (key[strlen(key)-1] == ' ') // remove trailing spaces
 			key[strlen(key)-1] = 0;
-		if (!COM_ParseToken(&data))
+		if (!COM_ParseToken(&data, false))
 			return; // error
-		strcpy(value, com_token);
+		strlcpy (value, com_token, sizeof (value));
 		if (!strcmp("sky", key))
 			R_SetSkyBox(value);
 		else if (!strcmp("skyname", key)) // non-standard, introduced by QuakeForge... sigh.
@@ -286,6 +290,9 @@ Con_DPrintf ("CL_SignonReply: %i\n", cls.signon);
 			MSG_WriteString (&cls.message, va("pmodel %i\n", cl_pmodel.integer));
 		}
 
+		MSG_WriteByte (&cls.message, clc_stringcmd);
+		MSG_WriteString (&cls.message, va("rate %i\n", cl_rate.integer));
+
 		MSG_WriteByte (&cls.message, clc_stringcmd);
 		MSG_WriteString (&cls.message, "spawn");
 		break;
@@ -325,19 +332,15 @@ void CL_ParseServerInfo (void)
 
 // parse protocol version number
 	i = MSG_ReadLong ();
-	if (i != PROTOCOL_VERSION && i != DPPROTOCOL_VERSION1 && i != DPPROTOCOL_VERSION2 && i != DPPROTOCOL_VERSION3 && i != 250)
+	// 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 ("Server is protocol %i, not %i, %i, %i or %i", i, DPPROTOCOL_VERSION1, DPPROTOCOL_VERSION2, DPPROTOCOL_VERSION3, PROTOCOL_VERSION);
+		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);
 		return;
 	}
-	Nehahrademcompatibility = false;
-	if (i == 250)
-		Nehahrademcompatibility = true;
-	if (cls.demoplayback && demo_nehahra.integer)
-		Nehahrademcompatibility = true;
-	dpprotocol = i;
-	if (dpprotocol != DPPROTOCOL_VERSION1 && dpprotocol != DPPROTOCOL_VERSION2 && dpprotocol != DPPROTOCOL_VERSION3)
-		dpprotocol = 0;
+	cl.protocol = i;
 
 // parse maxclients
 	cl.maxclients = MSG_ReadByte ();
@@ -354,13 +357,13 @@ void CL_ParseServerInfo (void)
 
 // parse signon message
 	str = MSG_ReadString ();
-	strncpy (cl.levelname, str, sizeof(cl.levelname)-1);
+	strlcpy (cl.levelname, str, sizeof(cl.levelname));
 
 // seperate the printfs so the server message can have a color
-	if (!Nehahrademcompatibility) // no messages when playing the Nehahra movie
+	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("%c%s\n", 2, str);
 	}
 
 	// check memory integrity
@@ -369,77 +372,84 @@ void CL_ParseServerInfo (void)
 	// disable until we get textures for it
 	R_ResetSkyBox();
 
-	memset (cl.model_precache, 0, sizeof(cl.model_precache));
-	memset (cl.sound_precache, 0, sizeof(cl.sound_precache));
+	memset(cl.model_precache, 0, sizeof(cl.model_precache));
+	memset(cl.sound_precache, 0, sizeof(cl.sound_precache));
 
-	// touch all of the precached models that are still loaded so we can free
-	// anything that isn't needed
-	Mod_ClearUsed();
+	// parse model precache list
 	for (nummodels=1 ; ; nummodels++)
 	{
-		CL_KeepaliveMessage ();
-		str = MSG_ReadString ();
+		str = MSG_ReadString();
 		if (!str[0])
 			break;
 		if (nummodels==MAX_MODELS)
 			Host_Error ("Server sent too many model precaches\n");
 		if (strlen(str) >= MAX_QPATH)
 			Host_Error ("Server sent a precache name of %i characters (max %i)", strlen(str), MAX_QPATH - 1);
-		strcpy (parse_model_precache[nummodels], str);
-		Mod_TouchModel (str);
+		strlcpy (parse_model_precache[nummodels], str, sizeof (parse_model_precache[nummodels]));
 	}
-
-	// do the same for sounds
+	// parse sound precache list
 	for (numsounds=1 ; ; numsounds++)
 	{
-		CL_KeepaliveMessage ();
-		str = MSG_ReadString ();
+		str = MSG_ReadString();
 		if (!str[0])
 			break;
 		if (numsounds==MAX_SOUNDS)
-			Host_Error ("Server sent too many sound precaches\n");
+			Host_Error("Server sent too many sound precaches\n");
 		if (strlen(str) >= MAX_QPATH)
-			Host_Error ("Server sent a precache name of %i characters (max %i)", strlen(str), MAX_QPATH - 1);
-		strcpy (parse_sound_precache[numsounds], str);
-		S_TouchSound (str);
+			Host_Error("Server sent a precache name of %i characters (max %i)", strlen(str), MAX_QPATH - 1);
+		strlcpy (parse_sound_precache[numsounds], str, sizeof (parse_sound_precache[numsounds]));
 	}
 
-	// purge anything that was not touched
+	// touch all of the precached models that are still loaded so we can free
+	// anything that isn't needed
+	Mod_ClearUsed();
+	for (i = 1;i < nummodels;i++)
+	{
+		CL_KeepaliveMessage();
+		Mod_TouchModel(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();
+
 	// now we try to load everything that is new
 
 	// world model
 	CL_KeepaliveMessage ();
-	cl.model_precache[1] = Mod_ForName (parse_model_precache[1], false, false, true);
+	cl.model_precache[1] = Mod_ForName(parse_model_precache[1], false, false, true);
 	if (cl.model_precache[1] == NULL)
 		Con_Printf("Map %s not found\n", parse_model_precache[1]);
 
 	// normal models
 	for (i=2 ; i<nummodels ; i++)
 	{
-		CL_KeepaliveMessage ();
-		if ((cl.model_precache[i] = Mod_ForName (parse_model_precache[i], false, false, false)) == NULL)
+		CL_KeepaliveMessage();
+		if ((cl.model_precache[i] = Mod_ForName(parse_model_precache[i], false, false, false)) == NULL)
 			Con_Printf("Model %s not found\n", parse_model_precache[i]);
 	}
 
 	// sounds
-	S_BeginPrecaching ();
 	for (i=1 ; i<numsounds ; i++)
 	{
-		CL_KeepaliveMessage ();
-		cl.sound_precache[i] = S_PrecacheSound (parse_sound_precache[i], true);
+		CL_KeepaliveMessage();
+		cl.sound_precache[i] = S_PrecacheSound(parse_sound_precache[i], true);
 	}
-	S_EndPrecaching ();
 
 	// local state
 	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.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);
@@ -448,7 +458,7 @@ void CL_ParseServerInfo (void)
 
 	cl_num_entities = 1;
 
-	R_Modules_NewMap ();
+	R_Modules_NewMap();
 	CL_CGVM_Start();
 
 	// noclip is turned off at start
@@ -519,7 +529,7 @@ void CL_MoveLerpEntityStates(entity_t *ent)
 		// 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)
+		if (cl.islocalgame)
 			ent->persistent.lerpdeltatime = 0;
 		else
 			ent->persistent.lerpdeltatime = cl.mtime[0] - cl.mtime[1];
@@ -547,7 +557,7 @@ void CL_ParseUpdate (int bits)
 
 	if (bits & U_MOREBITS)
 		bits |= (MSG_ReadByte()<<8);
-	if ((bits & U_EXTEND1) && (!Nehahrademcompatibility))
+	if ((bits & U_EXTEND1) && cl.protocol != PROTOCOL_NEHAHRAMOVIE)
 	{
 		bits |= MSG_ReadByte() << 16;
 		if (bits & U_EXTEND2)
@@ -606,7 +616,7 @@ void CL_ParseUpdate (int bits)
 	if (bits & U_EXTERIORMODEL)	new.flags |= RENDER_EXTERIORMODEL;
 
 	// LordHavoc: to allow playback of the Nehahra movie
-	if (Nehahrademcompatibility && (bits & U_EXTEND1))
+	if (cl.protocol == PROTOCOL_NEHAHRAMOVIE && (bits & U_EXTEND1))
 	{
 		// LordHavoc: evil format
 		int i = MSG_ReadFloat();
@@ -640,22 +650,32 @@ void CL_ParseUpdate (int bits)
 }
 
 static entity_frame_t entityframe;
+extern mempool_t *cl_entities_mempool;
 void CL_ReadEntityFrame(void)
 {
-	entity_t *ent;
-	int i;
-	EntityFrame_Read(&cl.entitydatabase);
-	EntityFrame_FetchFrame(&cl.entitydatabase, EntityFrame_MostRecentlyRecievedFrameNum(&cl.entitydatabase), &entityframe);
-	for (i = 0;i < entityframe.numentities;i++)
+	if (cl.protocol == PROTOCOL_DARKPLACES1 || cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3)
 	{
-		// 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;
+		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);
 	}
 }
 
@@ -665,18 +685,21 @@ void CL_EntityUpdateSetup(void)
 
 void CL_EntityUpdateEnd(void)
 {
-	int i;
-	// disable entities that disappeared this frame
-	for (i = 1;i < MAX_EDICTS;i++)
+	if (cl.protocol == PROTOCOL_QUAKE || cl.protocol == PROTOCOL_NEHAHRAMOVIE || cl.protocol == PROTOCOL_DARKPLACES1 || cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3)
 	{
-		// 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])
+		int i;
+		// disable entities that disappeared this frame
+		for (i = 1;i < MAX_EDICTS;i++)
 		{
-			entlife[i]--;
-			if (!entlife[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;
+			}
 		}
 	}
 }
@@ -690,7 +713,7 @@ void CL_ParseBaseline (entity_t *ent, int large)
 {
 	int i;
 
-	memset(&ent->state_baseline, 0, sizeof(entity_state_t));
+	ClearStateToDefault(&ent->state_baseline);
 	ent->state_baseline.active = true;
 	if (large)
 	{
@@ -709,13 +732,8 @@ void CL_ParseBaseline (entity_t *ent, int large)
 		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);
+	ent->state_previous = ent->state_current = ent->state_baseline;
 }
 
 
@@ -751,7 +769,7 @@ void CL_ParseClientdata (int bits)
 	{
 		if (bits & (SU_PUNCH1<<i) )
 		{
-			if (dpprotocol)
+			if (cl.protocol == PROTOCOL_DARKPLACES1 || cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3 || cl.protocol == PROTOCOL_DARKPLACES4)
 				cl.punchangle[i] = MSG_ReadPreciseAngle();
 			else
 				cl.punchangle[i] = MSG_ReadChar();
@@ -794,9 +812,13 @@ void CL_ParseClientdata (int bits)
 	i = MSG_ReadByte ();
 
 	if (gamemode == GAME_HIPNOTIC || gamemode == GAME_ROGUE)
-		cl.stats[STAT_ACTIVEWEAPON] = (1<<i);
-	else
-		cl.stats[STAT_ACTIVEWEAPON] = i;
+		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
+	if (cl.stats[STAT_ACTIVEWEAPON] != i)
+		cl.weapontime = cl.time;
+	cl.stats[STAT_ACTIVEWEAPON] = i;
 
 	cl.viewzoomold = cl.viewzoomnew; // for interpolation
 	if (bits & SU_VIEWZOOM)
@@ -977,7 +999,7 @@ void CL_ParseBeam (model_t *m, int lightning)
 	Con_Printf ("beam list overflow!\n");
 }
 
-void CL_ParseTempEntity (void)
+void CL_ParseTempEntity(void)
 {
 	int type;
 	vec3_t pos;
@@ -988,138 +1010,138 @@ void CL_ParseTempEntity (void)
 	int colorStart, colorLength, count;
 	float velspeed, radius;
 	qbyte *tempcolor;
+	matrix4x4_t tempmatrix;
 
-	type = MSG_ReadByte ();
+	type = MSG_ReadByte();
 	switch (type)
 	{
 	case TE_WIZSPIKE:
 		// spike hitting wall
 		MSG_ReadVector(pos);
-		Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4);
-		CL_AllocDlight (NULL, pos, 50, 0.25f, 1.00f, 0.25f, 250, 0.2);
-		CL_RunParticleEffect (pos, vec3_origin, 20, 30);
-		S_StartSound (-1, 0, cl_sfx_wizhit, pos, 1, 1);
+		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_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);
-		Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4);
-		CL_AllocDlight (NULL, pos, 50, 1.0f, 0.60f, 0.20f, 250, 0.2);
-		CL_RunParticleEffect (pos, vec3_origin, 226, 20);
-		S_StartSound (-1, 0, cl_sfx_knighthit, pos, 1, 1);
+		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_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);
-		Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4);
+		CL_FindNonSolidLocation(pos, pos, 4);
 		// LordHavoc: changed to spark shower
 		CL_SparkShower(pos, vec3_origin, 15);
-		if ( rand() % 5 )
-			S_StartSound (-1, 0, cl_sfx_tink1, pos, 1, 1);
+		if (rand() % 5)
+			S_StartSound(-1, 0, cl_sfx_tink1, pos, 1, 1);
 		else
 		{
 			rnd = rand() & 3;
 			if (rnd == 1)
-				S_StartSound (-1, 0, cl_sfx_ric1, pos, 1, 1);
+				S_StartSound(-1, 0, cl_sfx_ric1, pos, 1, 1);
 			else if (rnd == 2)
-				S_StartSound (-1, 0, cl_sfx_ric2, pos, 1, 1);
+				S_StartSound(-1, 0, cl_sfx_ric2, pos, 1, 1);
 			else
-				S_StartSound (-1, 0, cl_sfx_ric3, pos, 1, 1);
+				S_StartSound(-1, 0, cl_sfx_ric3, pos, 1, 1);
 		}
 		break;
 	case TE_SPIKEQUAD:
 		// quad spike hitting wall
 		MSG_ReadVector(pos);
-		Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4);
+		CL_FindNonSolidLocation(pos, pos, 4);
 		// LordHavoc: changed to spark shower
 		CL_SparkShower(pos, vec3_origin, 15);
-		CL_AllocDlight (NULL, pos, 200, 0.1f, 0.1f, 1.0f, 1000, 0.2);
-		S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1);
-		if ( rand() % 5 )
-			S_StartSound (-1, 0, cl_sfx_tink1, pos, 1, 1);
+		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);
+		S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1);
+		if (rand() % 5)
+			S_StartSound(-1, 0, cl_sfx_tink1, pos, 1, 1);
 		else
 		{
 			rnd = rand() & 3;
 			if (rnd == 1)
-				S_StartSound (-1, 0, cl_sfx_ric1, pos, 1, 1);
+				S_StartSound(-1, 0, cl_sfx_ric1, pos, 1, 1);
 			else if (rnd == 2)
-				S_StartSound (-1, 0, cl_sfx_ric2, pos, 1, 1);
+				S_StartSound(-1, 0, cl_sfx_ric2, pos, 1, 1);
 			else
-				S_StartSound (-1, 0, cl_sfx_ric3, pos, 1, 1);
+				S_StartSound(-1, 0, cl_sfx_ric3, pos, 1, 1);
 		}
 		break;
 	case TE_SUPERSPIKE:
 		// super spike hitting wall
 		MSG_ReadVector(pos);
-		Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4);
+		CL_FindNonSolidLocation(pos, pos, 4);
 		// LordHavoc: changed to dust shower
 		CL_SparkShower(pos, vec3_origin, 30);
-		if ( rand() % 5 )
-			S_StartSound (-1, 0, cl_sfx_tink1, pos, 1, 1);
+		if (rand() % 5)
+			S_StartSound(-1, 0, cl_sfx_tink1, pos, 1, 1);
 		else
 		{
 			rnd = rand() & 3;
 			if (rnd == 1)
-				S_StartSound (-1, 0, cl_sfx_ric1, pos, 1, 1);
+				S_StartSound(-1, 0, cl_sfx_ric1, pos, 1, 1);
 			else if (rnd == 2)
-				S_StartSound (-1, 0, cl_sfx_ric2, pos, 1, 1);
+				S_StartSound(-1, 0, cl_sfx_ric2, pos, 1, 1);
 			else
-				S_StartSound (-1, 0, cl_sfx_ric3, pos, 1, 1);
+				S_StartSound(-1, 0, cl_sfx_ric3, pos, 1, 1);
 		}
 		break;
 	case TE_SUPERSPIKEQUAD:
 		// quad super spike hitting wall
 		MSG_ReadVector(pos);
-		Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4);
+		CL_FindNonSolidLocation(pos, pos, 4);
 		// LordHavoc: changed to dust shower
 		CL_SparkShower(pos, vec3_origin, 30);
-		CL_AllocDlight (NULL, pos, 200, 0.1f, 0.1f, 1.0f, 1000, 0.2);
-		if ( rand() % 5 )
-			S_StartSound (-1, 0, cl_sfx_tink1, pos, 1, 1);
+		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);
+		if (rand() % 5)
+			S_StartSound(-1, 0, cl_sfx_tink1, pos, 1, 1);
 		else
 		{
 			rnd = rand() & 3;
 			if (rnd == 1)
-				S_StartSound (-1, 0, cl_sfx_ric1, pos, 1, 1);
+				S_StartSound(-1, 0, cl_sfx_ric1, pos, 1, 1);
 			else if (rnd == 2)
-				S_StartSound (-1, 0, cl_sfx_ric2, pos, 1, 1);
+				S_StartSound(-1, 0, cl_sfx_ric2, pos, 1, 1);
 			else
-				S_StartSound (-1, 0, cl_sfx_ric3, pos, 1, 1);
+				S_StartSound(-1, 0, cl_sfx_ric3, pos, 1, 1);
 		}
 		break;
 		// LordHavoc: added for improved blood splatters
 	case TE_BLOOD:
 		// blood puff
 		MSG_ReadVector(pos);
-		Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4);
-		dir[0] = MSG_ReadChar ();
-		dir[1] = MSG_ReadChar ();
-		dir[2] = MSG_ReadChar ();
-		count = MSG_ReadByte ();
+		CL_FindNonSolidLocation(pos, pos, 4);
+		dir[0] = MSG_ReadChar();
+		dir[1] = MSG_ReadChar();
+		dir[2] = MSG_ReadChar();
+		count = MSG_ReadByte();
 		CL_BloodPuff(pos, dir, count);
 		break;
-	case TE_BLOOD2:
-		// blood puff
-		MSG_ReadVector(pos);
-		Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4);
-		CL_BloodPuff(pos, vec3_origin, 10);
-		break;
 	case TE_SPARK:
 		// spark shower
 		MSG_ReadVector(pos);
-		Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4);
-		dir[0] = MSG_ReadChar ();
-		dir[1] = MSG_ReadChar ();
-		dir[2] = MSG_ReadChar ();
-		count = MSG_ReadByte ();
+		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);
 		break;
 	case TE_PLASMABURN:
 		MSG_ReadVector(pos);
-		Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4);
-		CL_AllocDlight (NULL, pos, 200, 1, 1, 1, 1000, 0.2);
+		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_PlasmaBurn(pos);
 		break;
 		// LordHavoc: added for improved gore
@@ -1127,8 +1149,8 @@ void CL_ParseTempEntity (void)
 		// vaporized body
 		MSG_ReadVector(pos); // mins
 		MSG_ReadVector(pos2); // maxs
-		velspeed = MSG_ReadCoord (); // speed
-		count = MSG_ReadShort (); // number of particles
+		velspeed = MSG_ReadCoord(); // speed
+		count = MSG_ReadShort(); // number of particles
 		CL_BloodShower(pos, pos2, velspeed, count);
 		break;
 	case TE_PARTICLECUBE:
@@ -1136,10 +1158,10 @@ void CL_ParseTempEntity (void)
 		MSG_ReadVector(pos); // mins
 		MSG_ReadVector(pos2); // maxs
 		MSG_ReadVector(dir); // dir
-		count = MSG_ReadShort (); // number of particles
-		colorStart = MSG_ReadByte (); // color
-		colorLength = MSG_ReadByte (); // gravity (1 or 0)
-		velspeed = MSG_ReadCoord (); // randomvel
+		count = MSG_ReadShort(); // number of particles
+		colorStart = MSG_ReadByte(); // color
+		colorLength = MSG_ReadByte(); // gravity (1 or 0)
+		velspeed = MSG_ReadCoord(); // randomvel
 		CL_ParticleCube(pos, pos2, dir, count, colorStart, colorLength, velspeed);
 		break;
 
@@ -1148,8 +1170,8 @@ void CL_ParseTempEntity (void)
 		MSG_ReadVector(pos); // mins
 		MSG_ReadVector(pos2); // maxs
 		MSG_ReadVector(dir); // dir
-		count = MSG_ReadShort (); // number of particles
-		colorStart = MSG_ReadByte (); // color
+		count = MSG_ReadShort(); // number of particles
+		colorStart = MSG_ReadByte(); // color
 		CL_ParticleRain(pos, pos2, dir, count, colorStart, 0);
 		break;
 
@@ -1158,15 +1180,15 @@ void CL_ParseTempEntity (void)
 		MSG_ReadVector(pos); // mins
 		MSG_ReadVector(pos2); // maxs
 		MSG_ReadVector(dir); // dir
-		count = MSG_ReadShort (); // number of particles
-		colorStart = MSG_ReadByte (); // color
+		count = 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);
-		Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4);
+		CL_FindNonSolidLocation(pos, pos, 4);
 		// LordHavoc: changed to dust shower
 		CL_SparkShower(pos, vec3_origin, 15);
 		break;
@@ -1174,77 +1196,85 @@ void CL_ParseTempEntity (void)
 	case TE_GUNSHOTQUAD:
 		// quad bullet hitting wall
 		MSG_ReadVector(pos);
-		Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4);
+		CL_FindNonSolidLocation(pos, pos, 4);
 		CL_SparkShower(pos, vec3_origin, 15);
-		CL_AllocDlight (NULL, pos, 200, 0.1f, 0.1f, 1.0f, 1000, 0.2);
+		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);
 		break;
 
 	case TE_EXPLOSION:
 		// rocket explosion
 		MSG_ReadVector(pos);
-		Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 10);
-		CL_ParticleExplosion (pos);
+		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
-		CL_AllocDlight (NULL, pos, 350, 1.25f, 1.0f, 0.5f, 700, 0.5);
-		S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1);
+		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);
+		S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1);
 		break;
 
 	case TE_EXPLOSIONQUAD:
 		// quad rocket explosion
 		MSG_ReadVector(pos);
-		Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 10);
-		CL_ParticleExplosion (pos);
-		CL_AllocDlight (NULL, pos, 600, 0.5f, 0.4f, 1.0f, 1200, 0.5);
-		S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1);
+		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);
+		S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1);
 		break;
 
 	case TE_EXPLOSION3:
 		// Nehahra movie colored lighting explosion
 		MSG_ReadVector(pos);
-		Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 10);
-		CL_ParticleExplosion (pos);
-		CL_AllocDlight (NULL, pos, 350, MSG_ReadCoord(), MSG_ReadCoord(), MSG_ReadCoord(), 700, 0.5);
-		S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1);
+		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);
+		S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1);
 		break;
 
 	case TE_EXPLOSIONRGB:
 		// colored lighting explosion
 		MSG_ReadVector(pos);
-		Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 10);
-		CL_ParticleExplosion (pos);
+		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);
-		CL_AllocDlight (NULL, pos, 350, color[0], color[1], color[2], 700, 0.5);
-		S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1);
+		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);
+		S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1);
 		break;
 
 	case TE_TAREXPLOSION:
 		// tarbaby explosion
 		MSG_ReadVector(pos);
-		Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 10);
-		CL_BlobExplosion (pos);
+		CL_FindNonSolidLocation(pos, pos, 10);
+		CL_BlobExplosion(pos);
 
-		S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1);
-		CL_AllocDlight (NULL, pos, 600, 0.8f, 0.4f, 1.0f, 1200, 0.5);
-		S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1);
+		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);
 		break;
 
 	case TE_SMALLFLASH:
 		MSG_ReadVector(pos);
-		Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 10);
-		CL_AllocDlight (NULL, pos, 200, 1, 1, 1, 1000, 0.2);
+		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);
 		break;
 
 	case TE_CUSTOMFLASH:
 		MSG_ReadVector(pos);
-		Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4);
+		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);
-		CL_AllocDlight (NULL, pos, radius, color[0], color[1], color[2], radius / velspeed, velspeed);
+		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);
 		break;
 
 	case TE_FLAMEJET:
@@ -1258,21 +1288,21 @@ void CL_ParseTempEntity (void)
 		// lightning bolts
 		if (!cl_model_bolt)
 			cl_model_bolt = Mod_ForName("progs/bolt.mdl", true, false, false);
-		CL_ParseBeam (cl_model_bolt, true);
+		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_ParseBeam (cl_model_bolt2, true);
+		CL_ParseBeam(cl_model_bolt2, true);
 		break;
 
 	case TE_LIGHTNING3:
 		// lightning bolts
 		if (!cl_model_bolt3)
 			cl_model_bolt3 = Mod_ForName("progs/bolt3.mdl", true, false, false);
-		CL_ParseBeam (cl_model_bolt3, false);
+		CL_ParseBeam(cl_model_bolt3, false);
 		break;
 
 // PGM 01/21/97
@@ -1280,40 +1310,42 @@ void CL_ParseTempEntity (void)
 		// grappling hook beam
 		if (!cl_model_beam)
 			cl_model_beam = Mod_ForName("progs/beam.mdl", true, false, false);
-		CL_ParseBeam (cl_model_beam, false);
+		CL_ParseBeam(cl_model_beam, false);
 		break;
 // PGM 01/21/97
 
 // LordHavoc: for compatibility with the Nehahra movie...
 	case TE_LIGHTNING4NEH:
-		CL_ParseBeam (Mod_ForName(MSG_ReadString(), true, false, false), false);
+		CL_ParseBeam(Mod_ForName(MSG_ReadString(), true, false, false), false);
 		break;
 
 	case TE_LAVASPLASH:
-		pos[0] = MSG_ReadCoord ();
-		pos[1] = MSG_ReadCoord ();
-		pos[2] = MSG_ReadCoord ();
-		CL_LavaSplash (pos);
+		pos[0] = MSG_ReadCoord();
+		pos[1] = MSG_ReadCoord();
+		pos[2] = MSG_ReadCoord();
+		CL_LavaSplash(pos);
 		break;
 
 	case TE_TELEPORT:
-		pos[0] = MSG_ReadCoord ();
-		pos[1] = MSG_ReadCoord ();
-		pos[2] = MSG_ReadCoord ();
-		CL_AllocDlight (NULL, pos, 500, 1.0f, 1.0f, 1.0f, 1500, 99.0f);
-//		CL_TeleportSplash (pos);
+		pos[0] = MSG_ReadCoord();
+		pos[1] = MSG_ReadCoord();
+		pos[2] = MSG_ReadCoord();
+		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_TeleportSplash(pos);
 		break;
 
 	case TE_EXPLOSION2:
 		// color mapped explosion
 		MSG_ReadVector(pos);
-		Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 10);
-		colorStart = MSG_ReadByte ();
-		colorLength = MSG_ReadByte ();
-		CL_ParticleExplosion2 (pos, colorStart, colorLength);
+		CL_FindNonSolidLocation(pos, pos, 10);
+		colorStart = MSG_ReadByte();
+		colorLength = MSG_ReadByte();
+		CL_ParticleExplosion2(pos, colorStart, colorLength);
 		tempcolor = (qbyte *)&palette_complete[(rand()%colorLength) + colorStart];
-		CL_AllocDlight (NULL, pos, 350, tempcolor[0] * (1.0f / 255.0f), tempcolor[1] * (1.0f / 255.0f), tempcolor[2] * (1.0f / 255.0f), 700, 0.5);
-		S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1);
+		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);
+		S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1);
 		break;
 
 	case TE_TEI_G3:
@@ -1327,30 +1359,32 @@ void CL_ParseTempEntity (void)
 	case TE_TEI_SMOKE:
 		MSG_ReadVector(pos);
 		MSG_ReadVector(dir);
-		count = MSG_ReadByte ();
-		Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4);
+		count = MSG_ReadByte();
+		CL_FindNonSolidLocation(pos, pos, 4);
 		CL_Tei_Smoke(pos, dir, count);
 		break;
 
 	case TE_TEI_BIGEXPLOSION:
 		MSG_ReadVector(pos);
-		Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 10);
-		CL_ParticleExplosion (pos);
-		CL_AllocDlight (NULL, pos, 500, 1.25f, 1.0f, 0.5f, 500, 9999);
-		S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1);
+		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);
+		S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1);
 		break;
 
 	case TE_TEI_PLASMAHIT:
 		MSG_ReadVector(pos);
 		MSG_ReadVector(dir);
-		count = MSG_ReadByte ();
-		Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 5);
+		count = MSG_ReadByte();
+		CL_FindNonSolidLocation(pos, pos, 5);
 		CL_Tei_PlasmaHit(pos, dir, count);
-		CL_AllocDlight (NULL, pos, 500, 0.3, 0.6, 1.0f, 2000, 9999);
+		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);
 		break;
 
 	default:
-		Host_Error ("CL_ParseTempEntity: bad type %d (hex %02X)", type, type);
+		Host_Error("CL_ParseTempEntity: bad type %d (hex %02X)", type, type);
 	}
 }
 
@@ -1445,7 +1479,7 @@ void CL_ParseServerMessage(void)
 			{
 				char description[32*64], temp[64];
 				int count;
-				strcpy(description, "packet dump: ");
+				strcpy (description, "packet dump: ");
 				i = cmdcount - 32;
 				if (i < 0)
 					i = 0;
@@ -1453,8 +1487,8 @@ void CL_ParseServerMessage(void)
 				i &= 31;
 				while(count > 0)
 				{
-					sprintf(temp, "%3i:%s ", cmdlog[i], cmdlogname[i]);
-					strcat(description, temp);
+					snprintf (temp, sizeof (temp), "%3i:%s ", cmdlog[i], cmdlogname[i]);
+					strlcat (description, temp, sizeof (description));
 					count--;
 					i++;
 					i &= 31;
@@ -1489,16 +1523,12 @@ void CL_ParseServerMessage(void)
 
 		case svc_version:
 			i = MSG_ReadLong ();
-			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.integer)
-				Nehahrademcompatibility = true;
-			dpprotocol = i;
-			if (dpprotocol != DPPROTOCOL_VERSION1 && dpprotocol != DPPROTOCOL_VERSION2 && dpprotocol != DPPROTOCOL_VERSION3)
-				dpprotocol = 0;
+			// 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);
+			cl.protocol = i;
 			break;
 
 		case svc_disconnect:
@@ -1530,7 +1560,9 @@ void CL_ParseServerMessage(void)
 			break;
 
 		case svc_setview:
-			cl.viewentity = MSG_ReadShort ();
+			cl.viewentity = (unsigned short)MSG_ReadShort ();
+			if (cl.viewentity >= MAX_EDICTS)
+				Host_Error("svc_setview >= MAX_EDICTS\n");
 			// LordHavoc: assume first setview recieved is the real player entity
 			if (!cl.playerentity)
 				cl.playerentity = cl.viewentity;
@@ -1540,7 +1572,7 @@ void CL_ParseServerMessage(void)
 			i = MSG_ReadByte ();
 			if (i >= MAX_LIGHTSTYLES)
 				Host_Error ("svc_lightstyle >= MAX_LIGHTSTYLES");
-			strncpy (cl_lightstyle[i].map,  MSG_ReadString(), MAX_STYLESTRING - 1);
+			strlcpy (cl_lightstyle[i].map,  MSG_ReadString(), sizeof (cl_lightstyle[i].map));
 			cl_lightstyle[i].map[MAX_STYLESTRING - 1] = 0;
 			cl_lightstyle[i].length = strlen(cl_lightstyle[i].map);
 			break;
@@ -1562,7 +1594,7 @@ void CL_ParseServerMessage(void)
 			i = MSG_ReadByte ();
 			if (i >= cl.maxclients)
 				Host_Error ("CL_ParseServerMessage: svc_updatename >= cl.maxclients");
-			strcpy (cl.scores[i].name, MSG_ReadString ());
+			strlcpy (cl.scores[i].name, MSG_ReadString (), sizeof (cl.scores[i].name));
 			break;
 
 		case svc_updatefrags:
@@ -1682,10 +1714,35 @@ void CL_ParseServerMessage(void)
 			Cmd_ExecuteString ("help", src_command);
 			break;
 		case svc_hidelmp:
-			SHOWLMP_decodehide();
+			if (gamemode == GAME_TENEBRAE)
+			{
+				// repeating particle effect
+				MSG_ReadCoord();
+				MSG_ReadCoord();
+				MSG_ReadCoord();
+				MSG_ReadCoord();
+				MSG_ReadCoord();
+				MSG_ReadCoord();
+				MSG_ReadByte();
+				MSG_ReadLong();
+				MSG_ReadLong();
+				MSG_ReadString();
+			}
+			else
+				SHOWLMP_decodehide();
 			break;
 		case svc_showlmp:
-			SHOWLMP_decodeshow();
+			if (gamemode == GAME_TENEBRAE)
+			{
+				// particle effect
+				MSG_ReadCoord();
+				MSG_ReadCoord();
+				MSG_ReadCoord();
+				MSG_ReadByte();
+				MSG_ReadString();
+			}
+			else
+				SHOWLMP_decodeshow();
 			break;
 		case svc_skybox:
 			R_SetSkyBox(MSG_ReadString());
@@ -1734,4 +1791,5 @@ void CL_Parse_Init(void)
 	Cvar_RegisterVariable (&demo_nehahra);
 	if (gamemode == GAME_NEHAHRA)
 		Cvar_SetValue("demo_nehahra", 1);
+	Cvar_RegisterVariable(&developer_networkentities);
 }