X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=cl_tent.c;h=d60ed56e189e9e38c6b950943f6c892e5e780c96;hb=13bc89911ececa44c12f5a8f7d311199df60ee20;hp=95f6699ee11887171250a7e1b53def807d94551f;hpb=9f6e4476fe8049342ac61c87ab7286912c1ff97c;p=xonotic%2Fdarkplaces.git

diff --git a/cl_tent.c b/cl_tent.c
index 95f6699e..d60ed56e 100644
--- a/cl_tent.c
+++ b/cl_tent.c
@@ -145,7 +145,7 @@ void CL_ParseTEnt (void)
 		pos[1] = MSG_ReadCoord ();
 		pos[2] = MSG_ReadCoord ();
 		// LordHavoc: changed to spark shower
-		R_SparkShower(pos, vec3_origin, 15, 0);
+		R_SparkShower(pos, vec3_origin, 15);
 		//R_RunParticleEffect (pos, vec3_origin, 0, 10);
 		if ( rand() % 5 )
 			S_StartSound (-1, 0, cl_sfx_tink1, pos, 1, 1);
@@ -165,7 +165,7 @@ void CL_ParseTEnt (void)
 		pos[1] = MSG_ReadCoord ();
 		pos[2] = MSG_ReadCoord ();
 		// LordHavoc: changed to spark shower
-		R_SparkShower(pos, vec3_origin, 15, 0);
+		R_SparkShower(pos, vec3_origin, 15);
 		//R_RunParticleEffect (pos, vec3_origin, 0, 10);
 		dl = CL_AllocDlight (0);
 		VectorCopy (pos, dl->origin);
@@ -192,7 +192,7 @@ void CL_ParseTEnt (void)
 		pos[1] = MSG_ReadCoord ();
 		pos[2] = MSG_ReadCoord ();
 		// LordHavoc: changed to dust shower
-		R_SparkShower(pos, vec3_origin, 30, 0);
+		R_SparkShower(pos, vec3_origin, 30);
 		//R_RunParticleEffect (pos, vec3_origin, 0, 20);
 		if ( rand() % 5 )
 			S_StartSound (-1, 0, cl_sfx_tink1, pos, 1, 1);
@@ -212,7 +212,7 @@ void CL_ParseTEnt (void)
 		pos[1] = MSG_ReadCoord ();
 		pos[2] = MSG_ReadCoord ();
 		// LordHavoc: changed to dust shower
-		R_SparkShower(pos, vec3_origin, 30, 0);
+		R_SparkShower(pos, vec3_origin, 30);
 		//R_RunParticleEffect (pos, vec3_origin, 0, 20);
 		dl = CL_AllocDlight (0);
 		VectorCopy (pos, dl->origin);
@@ -242,7 +242,13 @@ void CL_ParseTEnt (void)
 		dir[1] = MSG_ReadChar ();
 		dir[2] = MSG_ReadChar ();
 		count = MSG_ReadByte (); // amount of particles
-		R_SparkShower(pos, dir, count, 1);
+		R_BloodPuff(pos);
+		break;
+	case TE_BLOOD2:	// blood puff
+		pos[0] = MSG_ReadCoord ();
+		pos[1] = MSG_ReadCoord ();
+		pos[2] = MSG_ReadCoord ();
+		R_BloodPuff(pos);
 		break;
 	case TE_SPARK:	// spark shower
 		pos[0] = MSG_ReadCoord ();
@@ -252,7 +258,7 @@ void CL_ParseTEnt (void)
 		dir[1] = MSG_ReadChar ();
 		dir[2] = MSG_ReadChar ();
 		count = MSG_ReadByte (); // amount of particles
-		R_SparkShower(pos, dir, count, 0);
+		R_SparkShower(pos, dir, count);
 		break;
 		// LordHavoc: added for improved gore
 	case TE_BLOODSHOWER:	// vaporized body
@@ -318,7 +324,7 @@ void CL_ParseTEnt (void)
 		pos[1] = MSG_ReadCoord ();
 		pos[2] = MSG_ReadCoord ();
 		// LordHavoc: changed to dust shower
-		R_SparkShower(pos, vec3_origin, 15, 0);
+		R_SparkShower(pos, vec3_origin, 15);
 		//R_RunParticleEffect (pos, vec3_origin, 0, 20);
 		break;
 
@@ -326,7 +332,7 @@ void CL_ParseTEnt (void)
 		pos[0] = MSG_ReadCoord ();
 		pos[1] = MSG_ReadCoord ();
 		pos[2] = MSG_ReadCoord ();
-		R_SparkShower(pos, vec3_origin, 15, 0);
+		R_SparkShower(pos, vec3_origin, 15);
 		dl = CL_AllocDlight (0);
 		VectorCopy (pos, dl->origin);
 		dl->radius = 200;