X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=cl_particles.c;h=1a6ae07dcd3f8fe63e11823a424cb796c361f1b4;hb=b3f9f6064f1d6db727ad2bc4fac13898a740cfae;hp=1b0d3edd88bbfcea13588c3bde5733471ba812c7;hpb=5fc362d5d72a0aecbd5a64520b105650f8f2d794;p=xonotic%2Fdarkplaces.git

diff --git a/cl_particles.c b/cl_particles.c
index 1b0d3edd..1a6ae07d 100644
--- a/cl_particles.c
+++ b/cl_particles.c
@@ -546,11 +546,11 @@ void CL_ReadPointFile_f (void)
 #endif
 	if (!pointfile)
 	{
-		Con_Printf ("Could not open %s\n", name);
+		Con_Printf("Could not open %s\n", name);
 		return;
 	}
 
-	Con_Printf ("Reading %s...\n", name);
+	Con_Printf("Reading %s...\n", name);
 	c = 0;
 	s = 0;
 	pointfilepos = pointfile;
@@ -584,7 +584,7 @@ void CL_ReadPointFile_f (void)
 	Mem_Free(pointfile);
 #endif
 	VectorCopy(leakorg, org);
-	Con_Printf ("%i points read (%i particles spawned)\nLeak at %f %f %f\n", c, s, org[0], org[1], org[2]);
+	Con_Printf("%i points read (%i particles spawned)\nLeak at %f %f %f\n", c, s, org[0], org[1], org[2]);
 
 	particle(pt_static, PARTICLE_BEAM, 0xFF0000, 0xFF0000, tex_beam, false, PBLEND_ALPHA, 64, 64, 255, 0, 99999, 0, 0, org[0] - 4096, org[1], org[2], 0, 0, 0, 0, org[0] + 4096, org[1], org[2], 0, 0);
 	particle(pt_static, PARTICLE_BEAM, 0x00FF00, 0x00FF00, tex_beam, false, PBLEND_ALPHA, 64, 64, 255, 0, 99999, 0, 0, org[0], org[1] - 4096, org[2], 0, 0, 0, 0, org[0], org[1] + 4096, org[2], 0, 0);
@@ -1877,14 +1877,15 @@ void R_DrawParticleCallback(const void *calldata1, int calldata2)
 		}
 	}
 
-	GL_Color(cr, cg, cb, ca);
-
 	R_Mesh_Matrix(&r_identitymatrix);
 
 	memset(&m, 0, sizeof(m));
 	m.tex[0] = R_GetTexture(tex->texture);
 	m.pointer_texcoord[0] = particle_texcoord2f;
-	R_Mesh_State_Texture(&m);
+	m.pointer_vertex = particle_vertex3f;
+	R_Mesh_State(&m);
+
+	GL_Color(cr, cg, cb, ca);
 
 	if (p->blendmode == 0)
 		GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@@ -1894,7 +1895,6 @@ void R_DrawParticleCallback(const void *calldata1, int calldata2)
 		GL_BlendFunc(GL_ZERO, GL_ONE_MINUS_SRC_COLOR);
 	GL_DepthMask(false);
 	GL_DepthTest(true);
-	GL_VertexPointer(particle_vertex3f);
 #endif
 	if (p->orientation == PARTICLE_BILLBOARD || p->orientation == PARTICLE_ORIENTED_DOUBLESIDED)
 	{