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

diff --git a/cl_parse.c b/cl_parse.c
index e49f1c3c..d7432e0c 100644
--- a/cl_parse.c
+++ b/cl_parse.c
@@ -83,7 +83,7 @@ char *svc_strings[128] =
 	"", // 48
 	"", // 49
 	"svc_cgame", //				50		// [short] length [bytes] data
-	"svc_unusedlh1", //			51		// unused
+	"svc_updatestatubyte", //			51		// [byte] stat [byte] value
 	"svc_effect", //			52		// [vector] org [byte] modelindex [byte] startframe [byte] framecount [byte] framerate
 	"svc_effect2", //			53		// [vector] org [short] modelindex [short] startframe [byte] framecount [byte] framerate
 	"svc_sound2", //			54		// short soundindex instead of byte
@@ -204,8 +204,6 @@ void CL_KeepaliveMessage (void)
 		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(1);
 	}
 }
 
@@ -289,6 +287,16 @@ Con_DPrintf("CL_SignonReply: %i\n", cls.signon);
 			MSG_WriteByte (&cls.message, clc_stringcmd);
 			MSG_WriteString (&cls.message, va("pmodel %i\n", cl_pmodel.integer));
 		}
+		if (*cl_playermodel.string)
+		{
+			MSG_WriteByte (&cls.message, clc_stringcmd);
+			MSG_WriteString (&cls.message, va("playermodel %s\n", cl_playermodel.string));
+		}
+		if (*cl_playerskin.string)
+		{
+			MSG_WriteByte (&cls.message, clc_stringcmd);
+			MSG_WriteString (&cls.message, va("playerskin %s\n", cl_playerskin.string));
+		}
 
 		MSG_WriteByte (&cls.message, clc_stringcmd);
 		MSG_WriteString (&cls.message, va("rate %i\n", cl_rate.integer));
@@ -334,19 +342,19 @@ 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_DARKPLACES5 && i != PROTOCOL_NEHAHRAMOVIE)
+	if (i != PROTOCOL_QUAKE && i != PROTOCOL_DARKPLACES1 && i != PROTOCOL_DARKPLACES2 && i != PROTOCOL_DARKPLACES3 && i != PROTOCOL_DARKPLACES4 && i != PROTOCOL_DARKPLACES5 && i != PROTOCOL_DARKPLACES6 && i != 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);
+		Host_Error("CL_ParseServerInfo: Server is protocol %i, not %i (Quake), %i (DP1), %i (DP2), %i (DP3), %i (DP4), %i (DP5), %i (DP6), or %i (Nehahra movie)", i, PROTOCOL_QUAKE, PROTOCOL_DARKPLACES1, PROTOCOL_DARKPLACES2, PROTOCOL_DARKPLACES3, PROTOCOL_DARKPLACES4, PROTOCOL_DARKPLACES5, PROTOCOL_DARKPLACES6, PROTOCOL_NEHAHRAMOVIE);
 		return;
 	}
 	cl.protocol = i;
-	Con_DPrintf("Protocol %i\n", cl.protocol);
+	Con_DPrintf("Server protocol is %i\n", cl.protocol);
 
 // parse maxclients
 	cl.maxclients = MSG_ReadByte ();
 	if (cl.maxclients < 1 || cl.maxclients > MAX_SCOREBOARD)
 	{
-		Con_Printf("Bad maxclients (%u) from server\n", cl.maxclients);
+		Host_Error("Bad maxclients (%u) from server\n", cl.maxclients);
 		return;
 	}
 	Mem_EmptyPool(cl_scores_mempool);
@@ -366,6 +374,11 @@ void CL_ParseServerInfo (void)
 	// check memory integrity
 	Mem_CheckSentinelsGlobal();
 
+	S_StopAllSounds();
+	// if server is active, we already began a loading plaque
+	if (!sv.active)
+		SCR_BeginLoadingPlaque();
+
 	// disable until we get textures for it
 	R_ResetSkyBox();
 
@@ -401,10 +414,7 @@ void CL_ParseServerInfo (void)
 	// anything that isn't needed
 	Mod_ClearUsed();
 	for (i = 1;i < nummodels;i++)
-	{
-		CL_KeepaliveMessage();
 		Mod_FindName(parse_model_precache[i]);
-	}
 	Mod_PurgeUnused();
 
 	// do the same for sounds
@@ -431,7 +441,7 @@ void CL_ParseServerInfo (void)
 	{
 		CL_KeepaliveMessage();
 
-		// Don't lock the sfx here, S_ServerSounds already did that 
+		// Don't lock the sfx here, S_ServerSounds already did that
 		cl.sound_precache[i] = S_PrecacheSound (parse_sound_precache[i], true, false);
 	}
 
@@ -597,6 +607,29 @@ void CL_ParseClientdata (int bits)
 {
 	int i, j;
 
+	VectorCopy (cl.mpunchangle[0], cl.mpunchangle[1]);
+	VectorCopy (cl.mpunchvector[0], cl.mpunchvector[1]);
+	VectorCopy (cl.mvelocity[0], cl.mvelocity[1]);
+	cl.mviewzoom[1] = cl.mviewzoom[0];
+
+	if (cl.protocol != PROTOCOL_DARKPLACES6)
+	{
+		cl.stats[STAT_VIEWHEIGHT] = DEFAULT_VIEWHEIGHT;
+		cl.stats[STAT_ITEMS] = 0;
+		cl.stats[STAT_VIEWZOOM] = 255;
+	}
+	cl.idealpitch = 0;
+	cl.mpunchangle[0][0] = 0;
+	cl.mpunchangle[0][1] = 0;
+	cl.mpunchangle[0][2] = 0;
+	cl.mpunchvector[0][0] = 0;
+	cl.mpunchvector[0][1] = 0;
+	cl.mpunchvector[0][2] = 0;
+	cl.mvelocity[0][0] = 0;
+	cl.mvelocity[0][1] = 0;
+	cl.mvelocity[0][2] = 0;
+	cl.mviewzoom[0] = 1;
+
 	bits &= 0xFFFF;
 	if (bits & SU_EXTEND1)
 		bits |= (MSG_ReadByte() << 16);
@@ -604,85 +637,63 @@ void CL_ParseClientdata (int bits)
 		bits |= (MSG_ReadByte() << 24);
 
 	if (bits & SU_VIEWHEIGHT)
-		cl.viewheight = MSG_ReadChar ();
-	else
-		cl.viewheight = DEFAULT_VIEWHEIGHT;
+		cl.stats[STAT_VIEWHEIGHT] = MSG_ReadChar ();
 
 	if (bits & SU_IDEALPITCH)
 		cl.idealpitch = MSG_ReadChar ();
-	else
-		cl.idealpitch = 0;
 
-	VectorCopy (cl.mvelocity[0], cl.mvelocity[1]);
 	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.protocol == PROTOCOL_DARKPLACES5)
-				cl.punchangle[i] = MSG_ReadAngle16i();
+			if (cl.protocol == PROTOCOL_DARKPLACES1 || cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3 || cl.protocol == PROTOCOL_DARKPLACES4 || cl.protocol == PROTOCOL_DARKPLACES5 || cl.protocol == PROTOCOL_DARKPLACES6)
+				cl.mpunchangle[0][i] = MSG_ReadAngle16i();
 			else if (cl.protocol == PROTOCOL_QUAKE || cl.protocol == PROTOCOL_NEHAHRAMOVIE)
-				cl.punchangle[i] = MSG_ReadChar();
+				cl.mpunchangle[0][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))
 		{
 			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();
+				cl.mpunchvector[0][i] = MSG_ReadCoord16i();
+			else if (cl.protocol == PROTOCOL_DARKPLACES5 || cl.protocol == PROTOCOL_DARKPLACES6)
+				cl.mpunchvector[0][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) )
 		{
 			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)
+			else if (cl.protocol == PROTOCOL_DARKPLACES5 || cl.protocol == PROTOCOL_DARKPLACES6)
 				cl.mvelocity[0][i] = MSG_ReadCoord32f();
 			else
 				Host_Error("CL_ParseClientData: unknown cl.protocol %i\n", cl.protocol);
 		}
-		else
-			cl.mvelocity[0][i] = 0;
 	}
 
-	i = MSG_ReadLong ();
-	if (cl.items != i)
-	{	// set flash times
-		for (j=0 ; j<32 ; j++)
-			if ( (i & (1<<j)) && !(cl.items & (1<<j)))
-				cl.item_gettime[j] = cl.time;
-		cl.items = i;
-	}
+	if (bits & SU_ITEMS)
+		cl.stats[STAT_ITEMS] = MSG_ReadLong ();
 
 	cl.onground = (bits & SU_ONGROUND) != 0;
 	cl.inwater = (bits & SU_INWATER) != 0;
 
-	if (cl.protocol == PROTOCOL_DARKPLACES5)
+	if (cl.protocol == PROTOCOL_DARKPLACES6)
+	{
+	}
+	else 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 ();
+		cl.stats[STAT_ACTIVEWEAPON] = (unsigned short) MSG_ReadShort ();
 	}
 	else
 	{
@@ -691,38 +702,40 @@ void CL_ParseClientdata (int bits)
 		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 || gamemode == GAME_NEXUIZ)
+			cl.stats[STAT_ACTIVEWEAPON] = (1<<MSG_ReadByte ());
+		else
+			cl.stats[STAT_ACTIVEWEAPON] = MSG_ReadByte ();
 	}
 
-	// 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)
 	{
-		if (cl.protocol == PROTOCOL_DARKPLACES5)
-			i = (unsigned short) MSG_ReadShort();
+		if (cl.protocol == PROTOCOL_DARKPLACES5 || cl.protocol == PROTOCOL_DARKPLACES6)
+			cl.stats[STAT_VIEWZOOM] = (unsigned short) MSG_ReadShort();
 		else
-			i = MSG_ReadByte();
-		if (i < 2)
-			i = 2;
-		cl.viewzoomnew = (float) i * (1.0f / 255.0f);
+			cl.stats[STAT_VIEWZOOM] = MSG_ReadByte();
 	}
-	else
-		cl.viewzoomnew = 1;
 
+	// check for important changes
+
+	// set flash times
+	if (cl.olditems != cl.stats[STAT_ITEMS])
+		for (j = 0;j < 32;j++)
+			if ((cl.stats[STAT_ITEMS] & (1<<j)) && !(cl.olditems & (1<<j)))
+				cl.item_gettime[j] = cl.time;
+	cl.olditems = cl.stats[STAT_ITEMS];
+
+	// GAME_NEXUIZ hud needs weapon change time
+	if (cl.activeweapon != cl.stats[STAT_ACTIVEWEAPON])
+		cl.weapontime = cl.time;
+	cl.activeweapon = cl.stats[STAT_ACTIVEWEAPON];
+
+	// viewzoom interpolation
+	cl.mviewzoom[0] = (float) max(cl.stats[STAT_VIEWZOOM], 2) * (1.0f / 255.0f);
 }
 
 /*
@@ -825,7 +838,11 @@ 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 ("sound/wizard/hit.wav", false, true);
@@ -908,7 +925,7 @@ void CL_ParseTempEntity(void)
 		MSG_ReadVector(pos, cl.protocol);
 		CL_FindNonSolidLocation(pos, pos, 4);
 		Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
-		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_AllocDlight(NULL, &tempmatrix, 100, 0.12f, 0.50f, 0.12f, 500, 0.2, 0, -1, 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;
@@ -918,7 +935,7 @@ void CL_ParseTempEntity(void)
 		MSG_ReadVector(pos, cl.protocol);
 		CL_FindNonSolidLocation(pos, pos, 4);
 		Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
-		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_AllocDlight(NULL, &tempmatrix, 100, 0.50f, 0.30f, 0.10f, 500, 0.2, 0, -1, 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;
@@ -958,7 +975,7 @@ void CL_ParseTempEntity(void)
 			CL_BulletMark(pos);
 		}
 		Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
-		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);
+		CL_AllocDlight(NULL, &tempmatrix, 100, 0.15f, 0.15f, 1.5f, 500, 0.2, 0, -1, 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);
@@ -1009,7 +1026,7 @@ void CL_ParseTempEntity(void)
 			CL_BulletMark(pos);
 		}
 		Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
-		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);
+		CL_AllocDlight(NULL, &tempmatrix, 100, 0.15f, 0.15f, 1.5f, 500, 0.2, 0, -1, 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
@@ -1048,7 +1065,7 @@ void CL_ParseTempEntity(void)
 		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, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+		CL_AllocDlight(NULL, &tempmatrix, 200, 1, 1, 1, 1000, 0.2, 0, -1, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
 		CL_PlasmaBurn(pos);
 		break;
 		// LordHavoc: added for improved gore
@@ -1109,7 +1126,7 @@ void CL_ParseTempEntity(void)
 		CL_Smoke(pos, vec3_origin, 15);
 		CL_BulletMark(pos);
 		Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
-		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);
+		CL_AllocDlight(NULL, &tempmatrix, 100, 0.15f, 0.15f, 1.5f, 500, 0.2, 0, -1, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
 		break;
 
 	case TE_EXPLOSION:
@@ -1119,7 +1136,7 @@ void CL_ParseTempEntity(void)
 		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, 4.0f, 2.0f, 0.50f, 700, 0.5, 0, 0, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+		CL_AllocDlight(NULL, &tempmatrix, 350, 4.0f, 2.0f, 0.50f, 700, 0.5, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
 		S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1);
 		break;
 
@@ -1129,7 +1146,7 @@ void CL_ParseTempEntity(void)
 		CL_FindNonSolidLocation(pos, pos, 10);
 		CL_ParticleExplosion(pos);
 		Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
-		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);
+		CL_AllocDlight(NULL, &tempmatrix, 350, 2.5f, 2.0f, 4.0f, 700, 0.5, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
 		S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1);
 		break;
 
@@ -1142,7 +1159,7 @@ void CL_ParseTempEntity(void)
 		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);	
+		CL_AllocDlight(NULL, &tempmatrix, 350, color[0], color[1], color[2], 700, 0.5, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
 		S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1);
 		break;
 
@@ -1155,7 +1172,7 @@ void CL_ParseTempEntity(void)
 		color[1] = MSG_ReadByte() * (2.0f / 255.0f);
 		color[2] = MSG_ReadByte() * (2.0f / 255.0f);
 		Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
-		CL_AllocDlight(NULL, &tempmatrix, 350, color[0], color[1], color[2], 700, 0.5, 0, 0, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+		CL_AllocDlight(NULL, &tempmatrix, 350, color[0], color[1], color[2], 700, 0.5, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
 		S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1);
 		break;
 
@@ -1168,14 +1185,14 @@ void CL_ParseTempEntity(void)
 		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, 1.6f, 0.8f, 2.0f, 1200, 0.5, 0, 0, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+		CL_AllocDlight(NULL, &tempmatrix, 600, 1.6f, 0.8f, 2.0f, 1200, 0.5, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
 		break;
 
 	case TE_SMALLFLASH:
 		MSG_ReadVector(pos, cl.protocol);
 		CL_FindNonSolidLocation(pos, pos, 10);
 		Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
-		CL_AllocDlight(NULL, &tempmatrix, 200, 2, 2, 2, 1000, 0.2, 0, 0, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+		CL_AllocDlight(NULL, &tempmatrix, 200, 2, 2, 2, 1000, 0.2, 0, -1, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
 		break;
 
 	case TE_CUSTOMFLASH:
@@ -1187,7 +1204,7 @@ void CL_ParseTempEntity(void)
 		color[1] = MSG_ReadByte() * (2.0f / 255.0f);
 		color[2] = MSG_ReadByte() * (2.0f / 255.0f);
 		Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
-		CL_AllocDlight(NULL, &tempmatrix, radius, color[0], color[1], color[2], radius / velspeed, velspeed, 0, 0, true, 1, 0.25, 1, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+		CL_AllocDlight(NULL, &tempmatrix, radius, color[0], color[1], color[2], radius / velspeed, velspeed, 0, -1, true, 1, 0.25, 1, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
 		break;
 
 	case TE_FLAMEJET:
@@ -1240,7 +1257,7 @@ void CL_ParseTempEntity(void)
 	case TE_TELEPORT:
 		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, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+		CL_AllocDlight(NULL, &tempmatrix, 500, 1.0f, 1.0f, 1.0f, 1500, 99.0f, 0, -1, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
 //		CL_TeleportSplash(pos);
 		break;
 
@@ -1256,7 +1273,7 @@ void CL_ParseTempEntity(void)
 		color[1] = tempcolor[1] * (2.0f / 255.0f);
 		color[2] = tempcolor[2] * (2.0f / 255.0f);
 		Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
-		CL_AllocDlight(NULL, &tempmatrix, 350, color[0], color[1], color[2], 700, 0.5, 0, 0, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+		CL_AllocDlight(NULL, &tempmatrix, 350, color[0], color[1], color[2], 700, 0.5, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
 		S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1);
 		break;
 
@@ -1264,8 +1281,7 @@ void CL_ParseTempEntity(void)
 		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);
+		CL_BeamParticle(pos, pos2, 8, 1, 1, 1, 1, 1);
 		break;
 
 	case TE_TEI_SMOKE:
@@ -1281,7 +1297,7 @@ void CL_ParseTempEntity(void)
 		CL_FindNonSolidLocation(pos, pos, 10);
 		CL_ParticleExplosion(pos);
 		Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
-		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);
+		CL_AllocDlight(NULL, &tempmatrix, 500, 2.5f, 2.0f, 1.0f, 500, 9999, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
 		S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1);
 		break;
 
@@ -1292,7 +1308,7 @@ void CL_ParseTempEntity(void)
 		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.6, 1.2, 2.0f, 2000, 9999, 0, 0, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+		CL_AllocDlight(NULL, &tempmatrix, 500, 0.6, 1.2, 2.0f, 2000, 9999, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
 		break;
 
 	default:
@@ -1397,7 +1413,7 @@ void CL_ParseServerMessage(void)
 				i &= 31;
 				while(count > 0)
 				{
-					snprintf (temp, sizeof (temp), "%3i:%s ", cmdlog[i], cmdlogname[i]);
+					dpsnprintf (temp, sizeof (temp), "%3i:%s ", cmdlog[i], cmdlogname[i]);
 					strlcat (description, temp, sizeof (description));
 					count--;
 					i++;
@@ -1429,8 +1445,8 @@ 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_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);
+			if (i != PROTOCOL_QUAKE && i != PROTOCOL_DARKPLACES1 && i != PROTOCOL_DARKPLACES2 && i != PROTOCOL_DARKPLACES3 && i != PROTOCOL_DARKPLACES4 && i != PROTOCOL_DARKPLACES5 && i != PROTOCOL_DARKPLACES6 && i != PROTOCOL_NEHAHRAMOVIE)
+				Host_Error("CL_ParseServerMessage: Server is protocol %i, not %i (Quake), %i (DP1), %i (DP2), %i (DP3), %i (DP4), %i (DP5), %i (DP6), or %i (Nehahra movie)", i, PROTOCOL_QUAKE, PROTOCOL_DARKPLACES1, PROTOCOL_DARKPLACES2, PROTOCOL_DARKPLACES3, PROTOCOL_DARKPLACES4, PROTOCOL_DARKPLACES5, PROTOCOL_DARKPLACES6, PROTOCOL_NEHAHRAMOVIE);
 			cl.protocol = i;
 			break;
 
@@ -1489,8 +1505,42 @@ void CL_ParseServerMessage(void)
 			CL_ParseStartSoundPacket(false);
 			break;
 
-		case svc_sound2:
-			CL_ParseStartSoundPacket(true);
+		case svc_precache:
+			if (cl.protocol == PROTOCOL_DARKPLACES1 || cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3)
+			{
+				// was svc_sound2 in protocols 1, 2, 3, removed in 4, 5, changed to svc_precache in 6
+				CL_ParseStartSoundPacket(true);
+			}
+			else
+			{
+				int i = (unsigned short)MSG_ReadShort();
+				char *s = MSG_ReadString();
+				if (i < 32768)
+				{
+					if (i >= 1 && i < MAX_MODELS)
+					{
+						model_t *model = Mod_ForName(s, false, false, i == 1);
+						if (!model)
+							Con_Printf("svc_precache: Mod_ForName(\"%s\") failed\n", s);
+						cl.model_precache[i] = model;
+					}
+					else
+						Con_Printf("svc_precache: index %i outside range %i...%i\n", i, 1, MAX_MODELS);
+				}
+				else
+				{
+					i -= 32768;
+					if (i >= 1 && i < MAX_SOUNDS)
+					{
+						sfx_t *sfx = S_PrecacheSound (s, true, false);
+						if (!sfx && snd_initialized.integer)
+							Con_Printf("svc_precache: S_PrecacheSound(\"%s\") failed\n", s);
+						cl.sound_precache[i] = sfx;
+					}
+					else
+						Con_Printf("svc_precache: index %i outside range %i...%i\n", i, 1, MAX_SOUNDS);
+				}
+			}
 			break;
 
 		case svc_stopsound:
@@ -1564,7 +1614,9 @@ void CL_ParseServerMessage(void)
 
 		case svc_signonnum:
 			i = MSG_ReadByte ();
-			if (i <= cls.signon)
+			// LordHavoc: it's rude to kick off the client if they missed the
+			// reconnect somehow, so allow signon 1 even if at signon 1
+			if (i <= cls.signon && i != 1)
 				Host_Error ("Received signon %i when at %i", i, cls.signon);
 			cls.signon = i;
 			CL_SignonReply ();
@@ -1585,6 +1637,13 @@ void CL_ParseServerMessage(void)
 			cl.stats[i] = MSG_ReadLong ();
 			break;
 
+		case svc_updatestatubyte:
+			i = MSG_ReadByte ();
+			if (i < 0 || i >= MAX_CL_STATS)
+				Host_Error ("svc_updatestat: %i is invalid", i);
+			cl.stats[i] = MSG_ReadByte ();
+			break;
+
 		case svc_spawnstaticsound:
 			CL_ParseStaticSound (false);
 			break;
@@ -1677,7 +1736,7 @@ void CL_ParseServerMessage(void)
 				EntityFrame_CL_ReadFrame();
 			else if (cl.protocol == PROTOCOL_DARKPLACES4)
 				EntityFrame4_CL_ReadFrame();
-			else if (cl.protocol == PROTOCOL_DARKPLACES5)
+			else if (cl.protocol == PROTOCOL_DARKPLACES5 || cl.protocol == PROTOCOL_DARKPLACES6)
 				EntityFrame5_CL_ReadFrame();
 			else
 				Host_Error("CL_ParseServerMessage: svc_entities: unknown cl.protocol %i\n", cl.protocol);
@@ -1708,3 +1767,8 @@ void CL_Parse_Init(void)
 		Cvar_SetValue("demo_nehahra", 1);
 	Cvar_RegisterVariable(&developer_networkentities);
 }
+
+void CL_Parse_Shutdown(void)
+{
+	Mem_FreePool (&cl_scores_mempool);
+}