change protocol version table so that multiple numbers could correspond

[xonotic/darkplaces.git] / r_explosion.c

diff --git a/r_explosion.c b/r_explosion.c
index 4a965964741d316c1e80d11ef23f7c9ac62cd3ab..ecb83f17257a9c22baf64bc8102250206e7cc91b 100644 (file)
--- a/r_explosion.c
+++ b/r_explosion.c
@@ -63,7 +63,7 @@ extern qboolean r_loadfog;
 static void r_explosion_start(void)
 {
        int x, y;
-       unsigned char noise1[128][128], noise2[128][128], noise3[128][128], data[128][128][4];
+       static unsigned char noise1[128][128], noise2[128][128], noise3[128][128], data[128][128][4];
        explosiontexturepool = R_AllocTexturePool();
        explosiontexture = NULL;
        explosiontexturefog = NULL;
@@ -86,13 +86,13 @@ 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_PRECACHE | TEXF_FORCELINEAR, NULL);
+       explosiontexture = R_LoadTexture2D(explosiontexturepool, "explosiontexture", 128, 128, &data[0][0][0], TEXTYPE_BGRA, TEXF_MIPMAP | TEXF_ALPHA | TEXF_FORCELINEAR, NULL);
        if (r_loadfog)
        {
                for (y = 0;y < 128;y++)
                        for (x = 0;x < 128;x++)
                                data[y][x][0] = data[y][x][1] = data[y][x][2] = 255;
-               explosiontexturefog = R_LoadTexture2D(explosiontexturepool, "explosiontexture_fog", 128, 128, &data[0][0][0], TEXTYPE_BGRA, TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE | TEXF_FORCELINEAR, NULL);
+               explosiontexturefog = R_LoadTexture2D(explosiontexturepool, "explosiontexture_fog", 128, 128, &data[0][0][0], TEXTYPE_BGRA, TEXF_MIPMAP | TEXF_ALPHA | TEXF_FORCELINEAR, NULL);
        }
        // note that explosions survive the restart
 }
@@ -210,12 +210,11 @@ static void R_DrawExplosion_TransparentCallback(const entity_render_t *ent, cons
        GL_PolygonOffset(r_refdef.polygonfactor, r_refdef.polygonoffset);
        GL_DepthTest(true);
        GL_CullFace(r_refdef.view.cullface_back);
-       R_Mesh_Matrix(&identitymatrix);
+       R_EntityMatrix(&identitymatrix);
 
-       R_SetupGenericShader(true);
        R_Mesh_ColorPointer(NULL, 0, 0);
        R_Mesh_ResetTextureState();
-       R_Mesh_TexBind(0, R_GetTexture(explosiontexture));
+       R_SetupShader_Generic(explosiontexture, NULL, GL_MODULATE, 1);
        R_Mesh_TexCoordPointer(0, 2, explosiontexcoord2f[0], 0, 0);
        for (surfacelistindex = 0;surfacelistindex < numsurfaces;surfacelistindex++)
        {
@@ -223,9 +222,7 @@ static void R_DrawExplosion_TransparentCallback(const entity_render_t *ent, cons
                R_Mesh_VertexPointer(e->vert[0], 0, 0);
                // 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, 0, numtriangles, NULL, explosiontris[0], 0, 0);
-               GL_LockArrays(0, 0);
        }
 }