made traceon/traceoff take effect immediately (forgot to check for pr_trace change...

[xonotic/darkplaces.git] / cl_particles.c

diff --git a/cl_particles.c b/cl_particles.c
index c185062e58a7a3d8b4978267b925599c82ec9d69..4fe3bb1bf0e6797ae8ed42e20c4628e8043a1323 100644 (file)
--- a/cl_particles.c
+++ b/cl_particles.c
@@ -327,6 +327,7 @@ void CL_Particles_Init (void)
 {
        int             i;
 
+// COMMANDLINEOPTION: Client: -particles <number> changes maximum number of particles at once, default 32768
        i = COM_CheckParm ("-particles");
 
        if (i && i < com_argc - 1)
@@ -1124,6 +1125,7 @@ void CL_RocketTrail (vec3_t start, vec3_t end, int type, int color, entity_t *en
        if (speed)
                speed = 1.0f / speed;
        VectorSubtract(ent->state_current.origin, ent->state_previous.origin, vel);
+       color = particlepalette[color];
 #endif
        VectorScale(vel, speed, vel);
 
@@ -1497,7 +1499,7 @@ static particletexture_t particletexture[MAX_PARTICLETEXTURES];
 
 static cvar_t r_drawparticles = {0, "r_drawparticles", "1"};
 
-#define PARTICLETEXTURESIZE 32
+#define PARTICLETEXTURESIZE 64
 #define PARTICLEFONTSIZE (PARTICLETEXTURESIZE*8)
 
 static qbyte shadebubble(float dx, float dy, vec3_t light)
@@ -1759,6 +1761,11 @@ 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
+
+#if 0
+       Image_WriteTGARGBA ("particles/particlefont.tga", PARTICLEFONTSIZE, PARTICLEFONTSIZE, particletexturedata);
+#endif
+
        particlefonttexture = loadtextureimage(particletexturepool, "particles/particlefont.tga", 0, 0, false, TEXF_ALPHA | TEXF_PRECACHE);
        if (!particlefonttexture)
                particlefonttexture = R_LoadTexture2D(particletexturepool, "particlefont", PARTICLEFONTSIZE, PARTICLEFONTSIZE, particletexturedata, TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE, NULL);