]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
use TE_EXPLOSION in effectinfo.txt when encountering svc_particle with
authorhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Wed, 28 Jul 2010 20:12:11 +0000 (20:12 +0000)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 3 Aug 2010 06:57:13 +0000 (08:57 +0200)
count 1024 (exploboxes) rather than calling the internal
CL_ParticleExplosion directly, this allows people to override the effect

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10367 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=0d94889401823e11706331d987826497df4c9845

cl_particles.c

index c9cbd2bfd2990fa76b14a9382f3b8bc9a5174b69..1241acabbbbf212d4a59f6b66d944c6d40a19c26 100644 (file)
@@ -842,7 +842,7 @@ void CL_ParticleEffect_Fallback(int effectnameindex, float count, const vec3_t o
                {
                        // bloodhack checks if this effect's color matches regular or lightning blood and if so spawns a blood effect instead
                        if (count == 1024)
-                               CL_ParticleExplosion(center);
+                               CL_ParticleEffect(EFFECT_TE_EXPLOSION, 1, originmins, originmaxs, velocitymins, velocitymaxs, NULL, 0);
                        else if (cl_particles_blood_bloodhack.integer && !cl_particles_quake.integer && (palettecolor == 73 || palettecolor == 225))
                                CL_ParticleEffect(EFFECT_TE_BLOOD, count / 2.0f, originmins, originmaxs, velocitymins, velocitymaxs, NULL, 0);
                        else