fixed up various bugs with cl_beams_relative, and reenabled smooth sweeping on other...

[xonotic/darkplaces.git] / r_explosion.c

diff --git a/r_explosion.c b/r_explosion.c
index 430e399c08533ef30bc8f9fdbd27fff52e771139..7bf4e18328ff2be45168d11a996b179d359e5048 100644 (file)
--- a/r_explosion.c
+++ b/r_explosion.c
@@ -58,7 +58,7 @@ static cvar_t r_drawexplosions = {0, "r_drawexplosions", "1"};
 static void r_explosion_start(void)
 {
        int x, y;
-       qbyte noise1[128][128], noise2[128][128], noise3[128][128], data[128][128][4];
+       unsigned char noise1[128][128], noise2[128][128], noise3[128][128], data[128][128][4];
        explosiontexturepool = R_AllocTexturePool();
        fractalnoise(&noise1[0][0], 128, 32);
        fractalnoise(&noise2[0][0], 128, 4);
@@ -147,7 +147,7 @@ void R_NewExplosion(vec3_t org)
        float dist, n;
        explosion_t *e;
        trace_t trace;
-       qbyte noise[EXPLOSIONGRID*EXPLOSIONGRID];
+       unsigned char noise[EXPLOSIONGRID*EXPLOSIONGRID];
        fractalnoisequick(noise, EXPLOSIONGRID, 4); // adjust noise grid size according to explosion
        for (i = 0, e = explosion;i < MAX_EXPLOSIONS;i++, e++)
        {
@@ -186,7 +186,7 @@ static void R_DrawExplosionCallback(const void *calldata1, int calldata2)
        float alpha;
        rmeshstate_t m;
        const explosion_t *e;
-       e = calldata1;
+       e = (explosion_t *)calldata1;
 
        GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
        GL_DepthMask(false);