fix default effectinfo gravity and size

[xonotic/darkplaces.git] / cl_particles.c

diff --git a/cl_particles.c b/cl_particles.c
index 4ef3d667252ddcf1e1356dacf151fa81c475eea9..4f97c3d1f8847e3106fdd6e2be0f52653fad8739 100644 (file)
--- a/cl_particles.c
+++ b/cl_particles.c
@@ -226,13 +226,13 @@ particleeffectinfo_t baselineparticleeffectinfo =
        // if start and end of the range are the same, no randomization is done
        {63, 63 /* tex_particle */}, //int tex[2];
        // range of size values randomly chosen when spawning, plus size increase over time
-       {1, 1, 1}, //float size[3];
+       {1, 1, 0.0f}, //float size[3];
        // range of alpha values randomly chosen when spawning, plus alpha fade
        {0.0f, 256.0f, 256.0f}, //float alpha[3];
        // how long the particle should live (note it is also removed if alpha drops to 0)
        {16777216.0f, 16777216.0f}, //float time[2];
        // how much gravity affects this particle (negative makes it fly up!)
-       1.0f, //float gravity;
+       0.0f, //float gravity;
        // how much bounce the particle has when it hits a surface
        // if negative the particle is removed on impact
        0.0f, //float bounce;
@@ -367,6 +367,9 @@ void CL_Particles_ParseEffectInfo(const char *textstart, const char *textend, co
                        // copy entire info from baseline, then fix up the nameindex
                        *info = baselineparticleeffectinfo;
                        info->effectnameindex = effectnameindex;
+                       // Nexuiz had some busted effects that didn't specify this...
+                       if (gamemode == GAME_NEXUIZ)
+                               info->velocitymultiplier = 0.0f;
                }
                else if (info == NULL)
                {