Added a mempool parameter to FS_LoadFile

[xonotic/darkplaces.git] / cl_particles.c

diff --git a/cl_particles.c b/cl_particles.c
index aa458a271c3b34bd75011f7a8baa7075963af4a4..790abe05826c89efc035c87814271b1fde9f032f 100644 (file)
--- a/cl_particles.c
+++ b/cl_particles.c
@@ -542,7 +542,7 @@ void CL_ReadPointFile_f (void)
 #if WORKINGLQUAKE
        pointfile = COM_LoadTempFile (name);
 #else
-       pointfile = FS_LoadFile(name, true);
+       pointfile = FS_LoadFile(name, tempmempool, true);
 #endif
        if (!pointfile)
        {
@@ -1877,15 +1877,15 @@ void R_DrawParticleCallback(const void *calldata1, int calldata2)
                }
        }
 
-       GL_ColorPointer(NULL);
-       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);
@@ -1895,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)
        {