X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=cl_particles.c;h=6c28e575f05ef38feab933ddd18b9c1d98d49033;hb=398bcd13455cc5d1da5f8fb944eb815c7bbdc21d;hp=ab4f8209d460476449ea9b3a0c1bcf949ec8e713;hpb=a60096fc5858e0c4c08eb6422d8a47ebc194e098;p=xonotic%2Fdarkplaces.git diff --git a/cl_particles.c b/cl_particles.c index ab4f8209..6c28e575 100644 --- 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; @@ -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) {