X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=r_explosion.c;h=5ed511057be67b4a18fb181dc4bc975bd7e4afa0;hp=5dd1d01f662f7a7f04f5a4141339d4f5993582da;hb=65c1200fa869c82dc83f04c5bb43d91742669c6a;hpb=38185bc1aea210514d6970e3c36a25ad97615e5f

diff --git a/r_explosion.c b/r_explosion.c
index 5dd1d01f..5ed51105 100644
--- a/r_explosion.c
+++ b/r_explosion.c
@@ -86,7 +86,7 @@ static void r_explosion_start(void)
 			data[y][x][3] = bound(0, a, 255);
 		}
 	}
-	explosiontexture = R_LoadTexture2D(explosiontexturepool, "explosiontexture", 128, 128, &data[0][0][0], TEXTYPE_BGRA, TEXF_MIPMAP | TEXF_ALPHA | TEXF_FORCELINEAR, NULL);
+	explosiontexture = R_LoadTexture2D(explosiontexturepool, "explosiontexture", 128, 128, &data[0][0][0], TEXTYPE_BGRA, TEXF_MIPMAP | TEXF_ALPHA | TEXF_FORCELINEAR, -1, NULL);
 //	if (r_loadfog)
 //	{
 //		for (y = 0;y < 128;y++)
@@ -153,7 +153,7 @@ void R_Explosion_Init(void)
 #ifdef MAX_EXPLOSIONS
 	Cvar_RegisterVariable(&r_drawexplosions);
 
-	R_RegisterModule("R_Explosions", r_explosion_start, r_explosion_shutdown, r_explosion_newmap);
+	R_RegisterModule("R_Explosions", r_explosion_start, r_explosion_shutdown, r_explosion_newmap, NULL, NULL);
 #endif
 }
 
@@ -212,7 +212,7 @@ static void R_DrawExplosion_TransparentCallback(const entity_render_t *ent, cons
 	GL_CullFace(r_refdef.view.cullface_back);
 	R_EntityMatrix(&identitymatrix);
 
-	R_Mesh_ResetTextureState();
+//	R_Mesh_ResetTextureState();
 	R_SetupShader_Generic(explosiontexture, NULL, GL_MODULATE, 1);
 	for (surfacelistindex = 0;surfacelistindex < numsurfaces;surfacelistindex++)
 	{