X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=r_explosion.c;h=7ebaf1f9ba0fd5ce281c8e04b69651ab58b87ddc;hb=d7174df70530cb49c5053c1cb19da6e027b8ea41;hp=410fa67a14b26cfb2dca65d9802bcb316108652c;hpb=21beb5fe4fa2e1f1b7591a4a1f6013b82186912f;p=xonotic%2Fdarkplaces.git

diff --git a/r_explosion.c b/r_explosion.c
index 410fa67a..7ebaf1f9 100644
--- a/r_explosion.c
+++ b/r_explosion.c
@@ -29,7 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 static int numexplosions = 0;
 
 static float explosiontexcoord2f[EXPLOSIONVERTS][2];
-static int explosiontris[EXPLOSIONTRIS][3];
+static unsigned short explosiontris[EXPLOSIONTRIS][3];
 static int explosionnoiseindex[EXPLOSIONVERTS];
 static vec3_t explosionpoint[EXPLOSIONVERTS];
 
@@ -197,6 +197,7 @@ static void R_DrawExplosion_TransparentCallback(const entity_render_t *ent, cons
 	GL_CullFace(r_refdef.view.cullface_back);
 	R_Mesh_Matrix(&identitymatrix);
 
+	R_SetupGenericShader(true);
 	R_Mesh_ColorPointer(NULL, 0, 0);
 	memset(&m, 0, sizeof(m));
 	m.tex[0] = R_GetTexture(explosiontexture);
@@ -209,7 +210,7 @@ static void R_DrawExplosion_TransparentCallback(const entity_render_t *ent, cons
 		// FIXME: fixed function path can't properly handle r_refdef.view.colorscale > 1
 		GL_Color(e->alpha * r_refdef.view.colorscale, e->alpha * r_refdef.view.colorscale, e->alpha * r_refdef.view.colorscale, 1);
 		GL_LockArrays(0, numverts);
-		R_Mesh_Draw(0, numverts, numtriangles, explosiontris[0], 0, 0);
+		R_Mesh_Draw(0, numverts, 0, numtriangles, NULL, explosiontris[0], 0, 0);
 		GL_LockArrays(0, 0);
 	}
 }