commented out two unused static const int variables gcc 3.3 noticed

[xonotic/darkplaces.git] / cl_particles.c

diff --git a/cl_particles.c b/cl_particles.c
index 9995ccd8cecdb27994b769327c550b28485247f7..1409edcdc0a8451dcfa17e4ef00858a17f5dd76d 100644 (file)
--- a/cl_particles.c
+++ b/cl_particles.c
@@ -157,7 +157,7 @@ void VectorVectors(const vec3_t forward, vec3_t right, vec3_t up)
 
 typedef enum
 {
-       pt_static, pt_rain, pt_bubble, pt_blood
+       pt_static, pt_rain, pt_bubble, pt_blood, pt_grow
 }
 ptype_t;
 
@@ -236,9 +236,9 @@ static int particlepalette[256] =
 
 // these must match r_part.c's textures
 static const int tex_smoke[8] = {0, 1, 2, 3, 4, 5, 6, 7};
-static const int tex_rainsplash[16] = {8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23};
+//static const int tex_rainsplash[16] = {8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23};
 static const int tex_particle = 24;
-static const int tex_rain = 25;
+//static const int tex_rain = 25;
 static const int tex_bubble = 26;
 
 static int                     cl_maxparticles;
@@ -652,7 +652,7 @@ void CL_SparkShower (vec3_t org, vec3_t dir, int count)
                        k = count / 4;
                        while(k--)
                        {
-                               particle(pt_static, PARTICLE_BILLBOARD, 0x101010, 0x202020, tex_smoke[rand()&7], true, true, 4, 4, 255, 1024, 9999, -0.2, 0, org[0] + 0.125f * lhrandom(-count, count), org[1] + 0.125f * lhrandom (-count, count), org[2] + 0.125f * lhrandom(-count, count), lhrandom(-8, 8), lhrandom(-8, 8), lhrandom(0, 16), 0, 0, 0, 0, 0, 0);
+                               particle(pt_grow, PARTICLE_BILLBOARD, 0x101010, 0x202020, tex_smoke[rand()&7], true, true, 3, 3, 255, 1024, 9999, -0.2, 0, org[0] + 0.125f * lhrandom(-count, count), org[1] + 0.125f * lhrandom (-count, count), org[2] + 0.125f * lhrandom(-count, count), lhrandom(-8, 8), lhrandom(-8, 8), lhrandom(0, 16), 15, 0, 0, 0, 0, 0);
                        }
                }
 
@@ -960,7 +960,7 @@ void CL_RocketTrail (vec3_t start, vec3_t end, int type, entity_t *ent)
                                dec = 3;
                                if (smoke)
                                {
-                                       particle(pt_static, PARTICLE_BILLBOARD, 0x303030, 0x606060, tex_smoke[rand()&7], false, true, dec, dec, 32, 64, 9999, 0, 0, pos[0], pos[1], pos[2], lhrandom(-5, 5), lhrandom(-5, 5), lhrandom(-5, 5), 0, 0, 0, 0, 0, 0);
+                                       particle(pt_grow,   PARTICLE_BILLBOARD, 0x303030, 0x606060, tex_smoke[rand()&7], false, true, dec, dec, 32, 64, 9999, 0, 0, pos[0], pos[1], pos[2], lhrandom(-5, 5), lhrandom(-5, 5), lhrandom(-5, 5), 6, 0, 0, 0, 0, 0);
                                        particle(pt_static, PARTICLE_BILLBOARD, 0x801010, 0xFFA020, tex_smoke[rand()&7], false, true, dec, dec, 128, 768, 9999, 0, 0, pos[0], pos[1], pos[2], lhrandom(-20, 20), lhrandom(-20, 20), lhrandom(-20, 20), 0, 0, 0, 0, 0, 0);
                                }
                                if (bubbles)
@@ -1172,6 +1172,10 @@ void CL_MoveParticles (void)
                                if (a != CONTENTS_EMPTY && a != CONTENTS_SKY)
                                        p->die = -1;
                                break;
+                       case pt_grow:
+                               p->scalex += frametime * p->time2;
+                               p->scaley += frametime * p->time2;
+                               break;
                        default:
                                printf("unknown particle type %i\n", p->type);
                                p->die = -1;
@@ -1402,7 +1406,7 @@ static void R_InitParticleTexture (void)
        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 #else
-       particlefonttexture = R_LoadTexture (particletexturepool, "particlefont", 256, 256, particletexturedata, TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE);
+       particlefonttexture = R_LoadTexture2D(particletexturepool, "particlefont", 256, 256, particletexturedata, TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE, NULL);
 #endif
 }
 
@@ -1501,9 +1505,9 @@ void R_DrawParticleCallback(const void *calldata1, int calldata2)
        cb *= r_colorscale;
 
        varray_texcoord[0][0] = tex->s2;varray_texcoord[0][1] = tex->t1;
-       varray_texcoord[0][2] = tex->s1;varray_texcoord[0][3] = tex->t1;
-       varray_texcoord[0][4] = tex->s1;varray_texcoord[0][5] = tex->t2;
-       varray_texcoord[0][6] = tex->s2;varray_texcoord[0][7] = tex->t2;
+       varray_texcoord[0][4] = tex->s1;varray_texcoord[0][5] = tex->t1;
+       varray_texcoord[0][8] = tex->s1;varray_texcoord[0][9] = tex->t2;
+       varray_texcoord[0][12] = tex->s2;varray_texcoord[0][13] = tex->t2;
 #endif
 
        if (orientation == PARTICLE_BEAM)