Solaris compile fixes

[xonotic/darkplaces.git] / r_explosion.c

diff --git a/r_explosion.c b/r_explosion.c
index 268e9806dd1a2124bb384066126aef859de5b1cc..7ebaf1f9ba0fd5ce281c8e04b69651ab58b87ddc 100644 (file)
--- a/r_explosion.c
+++ b/r_explosion.c
@@ -26,8 +26,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define EXPLOSIONVERTS ((EXPLOSIONGRID+1)*(EXPLOSIONGRID+1))
 #define EXPLOSIONTRIS (EXPLOSIONGRID*EXPLOSIONGRID*2)
 
+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];
 
@@ -94,6 +96,7 @@ static void r_explosion_shutdown(void)
 
 static void r_explosion_newmap(void)
 {
+       numexplosions = 0;
        memset(explosion, 0, sizeof(explosion));
 }
 
@@ -153,6 +156,7 @@ void R_NewExplosion(const vec3_t org)
        {
                if (!e->alpha)
                {
+                       numexplosions = max(numexplosions, i + 1);
                        e->starttime = cl.time;
                        e->endtime = cl.time + cl_explosions_lifetime.value;
                        e->time = e->starttime;
@@ -193,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);
@@ -205,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);
        }
 }
@@ -246,23 +251,23 @@ static void R_MoveExplosion(explosion_t *e)
        }
 }
 
-
-void R_MoveExplosions(void)
-{
-       int i;
-       for (i = 0;i < MAX_EXPLOSIONS;i++)
-               if (explosion[i].alpha)
-                       R_MoveExplosion(&explosion[i]);
-}
-
 void R_DrawExplosions(void)
 {
        int i;
 
        if (!r_drawexplosions.integer)
                return;
-       for (i = 0;i < MAX_EXPLOSIONS;i++)
+
+       for (i = 0;i < numexplosions;i++)
+       {
                if (explosion[i].alpha)
-                       R_MeshQueue_AddTransparent(explosion[i].origin, R_DrawExplosion_TransparentCallback, NULL, i, NULL);
+               {
+                       R_MoveExplosion(&explosion[i]);
+                       if (explosion[i].alpha)
+                               R_MeshQueue_AddTransparent(explosion[i].origin, R_DrawExplosion_TransparentCallback, NULL, i, NULL);
+               }
+       }
+       while (numexplosions > 0 && explosion[i-1].alpha <= 0)
+               numexplosions--;
 }