rewrote timing code, now a much better and very different sleeping method, no longer...

[xonotic/darkplaces.git] / r_explosion.c

diff --git a/r_explosion.c b/r_explosion.c
index d1e51b97b4ff5d607982e8666ac87f526e0fa25b..4dd9f853ed6832c4750842db2998364d80851fb5 100644 (file)
--- a/r_explosion.c
+++ b/r_explosion.c
@@ -141,7 +141,7 @@ void R_Explosion_Init(void)
        R_RegisterModule("R_Explosions", r_explosion_start, r_explosion_shutdown, r_explosion_newmap);
 }
 
-void R_NewExplosion(vec3_t org)
+void R_NewExplosion(const vec3_t org)
 {
        int i, j;
        float dist, n;
@@ -190,17 +190,18 @@ static void R_DrawExplosion_TransparentCallback(const entity_render_t *ent, int
        GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
        GL_DepthMask(false);
        GL_DepthTest(true);
-       R_Mesh_Matrix(&r_identitymatrix);
+       R_Mesh_Matrix(&identitymatrix);
 
        numtriangles = EXPLOSIONTRIS;
        numverts = EXPLOSIONVERTS;
        alpha = e->alpha;
 
+       R_Mesh_VertexPointer(e->vert[0]);
+       R_Mesh_ColorPointer(NULL);
        memset(&m, 0, sizeof(m));
        m.tex[0] = R_GetTexture(explosiontexture);
        m.pointer_texcoord[0] = explosiontexcoord2f[0];
-       m.pointer_vertex = e->vert[0];
-       R_Mesh_State(&m);
+       R_Mesh_TextureState(&m);
 
        GL_Color(alpha, alpha, alpha, 1);