]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
effectinfo velocitymultiplier defaults to 0 again
authorhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Fri, 1 Jul 2011 05:42:57 +0000 (05:42 +0000)
committerRudolf Polzer <divverent@xonotic.org>
Fri, 1 Jul 2011 05:44:22 +0000 (07:44 +0200)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11230 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=ed8d0725afa9ebc075da0df1306e1cc41bb56c2d

cl_particles.c

index 4f97c3d1f8847e3106fdd6e2be0f52653fad8739..6c28e575f05ef38feab933ddd18b9c1d98d49033 100644 (file)
@@ -251,7 +251,7 @@ particleeffectinfo_t baselineparticleeffectinfo =
        {0.0f, 0.0f, 0.0f}, //float velocityoffset[3];
        {0.0f, 0.0f, 0.0f}, //float originjitter[3];
        {0.0f, 0.0f, 0.0f}, //float velocityjitter[3];
-       1.0f, //float velocitymultiplier;
+       0.0f, //float velocitymultiplier;
        // an effect can also spawn a dlight
        0.0f, //float lightradiusstart;
        0.0f, //float lightradiusfade;
@@ -367,9 +367,6 @@ 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)
                {