X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=cl_parse.c;h=7accccbefd19066fa6298f2e2716e788151950f3;hb=9cff7ce705dc918e3a343bee67dd8d734101c310;hp=43cb2c28b976d9224e6724d1980958c844b13f9e;hpb=093c41bf532834207d8a23df44f5b39fa707815d;p=xonotic%2Fdarkplaces.git

diff --git a/cl_parse.c b/cl_parse.c
index 43cb2c28..7accccbe 100644
--- a/cl_parse.c
+++ b/cl_parse.c
@@ -113,7 +113,6 @@ void CL_ParseStartSoundPacket(int largesoundindex)
 	int 	volume;
 	int 	field_mask;
 	float 	attenuation;
-	int		i;
 
 	field_mask = MSG_ReadByte();
 
@@ -151,8 +150,7 @@ 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);
 
 	S_StartSound (ent, channel, cl.sound_precache[sound_num], pos, volume/255.0, attenuation);
 }
@@ -215,7 +213,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;
@@ -290,6 +289,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;
@@ -332,9 +334,9 @@ 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;
@@ -444,9 +446,9 @@ 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);
@@ -762,25 +764,46 @@ void CL_ParseClientdata (int bits)
 		cl.idealpitch = 0;
 
 	VectorCopy (cl.mvelocity[0], cl.mvelocity[1]);
-	for (i=0 ; i<3 ; i++)
+	if (cl.protocol == PROTOCOL_DARKPLACES5)
 	{
-		if (bits & (SU_PUNCH1<<i) )
+		for (i = 0;i < 3;i++)
 		{
-			if (cl.protocol == PROTOCOL_DARKPLACES1 || cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3 || cl.protocol == PROTOCOL_DARKPLACES4)
+			if (bits & (SU_PUNCH1<<i) )
 				cl.punchangle[i] = MSG_ReadPreciseAngle();
 			else
-				cl.punchangle[i] = MSG_ReadChar();
+				cl.punchangle[i] = 0;
+			if (bits & (SU_PUNCHVEC1<<i))
+				cl.punchvector[i] = MSG_ReadFloat();
+			else
+				cl.punchvector[i] = 0;
+			if (bits & (SU_VELOCITY1<<i) )
+				cl.mvelocity[0][i] = MSG_ReadFloat();
+			else
+				cl.mvelocity[0][i] = 0;
+		}
+	}
+	else
+	{
+		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_ReadPreciseAngle();
+				else
+					cl.punchangle[i] = MSG_ReadChar();
+			}
+			else
+				cl.punchangle[i] = 0;
+			if (bits & (SU_PUNCHVEC1<<i))
+				cl.punchvector[i] = MSG_ReadCoord();
+			else
+				cl.punchvector[i] = 0;
+			if (bits & (SU_VELOCITY1<<i) )
+				cl.mvelocity[0][i] = MSG_ReadChar()*16;
+			else
+				cl.mvelocity[0][i] = 0;
 		}
-		else
-			cl.punchangle[i] = 0;
-		if (bits & (SU_PUNCHVEC1<<i))
-			cl.punchvector[i] = MSG_ReadCoord();
-		else
-			cl.punchvector[i] = 0;
-		if (bits & (SU_VELOCITY1<<i) )
-			cl.mvelocity[0][i] = MSG_ReadChar()*16;
-		else
-			cl.mvelocity[0][i] = 0;
 	}
 
 	i = MSG_ReadLong ();
@@ -1317,16 +1340,12 @@ void CL_ParseTempEntity(void)
 		break;
 
 	case TE_LAVASPLASH:
-		pos[0] = MSG_ReadCoord();
-		pos[1] = MSG_ReadCoord();
-		pos[2] = MSG_ReadCoord();
+		MSG_ReadVector(pos);
 		CL_LavaSplash(pos);
 		break;
 
 	case TE_TELEPORT:
-		pos[0] = MSG_ReadCoord();
-		pos[1] = MSG_ReadCoord();
-		pos[2] = MSG_ReadCoord();
+		MSG_ReadVector(pos);
 		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);
@@ -1523,8 +1542,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_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;